[FFmpeg-cvslog] Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 18 12:10:46 2013 +0100| [4ff0e63a015a5f88e514b924221c89b690565a2d] | committer: Michael Niedermayer

Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'

* commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17':
  libopencore-amrnb: cosmetics: Group all encoder-related code together

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

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