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)
commit5d06b6e984706368f1fe3bce38d2dcea1821b7e9
tree4c2eb508fab5d9f8bd72a4d740b73f5c8c45cfbd
parenteb24186b457b6b4e77b5d8ebf10a6654eebc2599
parentfe414059ec1fe8237574bed34cdaa8ac3893917b
Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'

* commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b':
  rtpdec_amr: Use the common indentation style

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