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)
* commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17':
  libopencore-amrnb: cosmetics: Group all encoder-related code together

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

Simple merge