Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:11:54 +0000 (22:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 21:11:58 +0000 (22:11 +0100)
* commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b':
  rtpdec_amr: Use the common indentation style

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec_amr.c

Simple merge