[FFmpeg-cvslog] Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 24 22:11:54 2015 +0100| [5d06b6e984706368f1fe3bce38d2dcea1821b7e9] | committer: Michael Niedermayer

Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d06b6e984706368f1fe3bce38d2dcea1821b7e9
---