Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:10:46 +0000 (12:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:10:57 +0000 (12:10 +0100)
commit4ff0e63a015a5f88e514b924221c89b690565a2d
tree4d7c826439985d56e37da69d6e81ec440d1ea9cd
parentf88f7b86a962b2c700bf37d82d81a73ea2a5aad1
parent56632fef65c0cb6946ed3648ded3d7b82e5c5c17
Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libopencore-amr.c