Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:15:07 +0000 (12:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:15:12 +0000 (12:15 +0100)
* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
  libopencore-amr: Conditionally compile decoder and encoder bits

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

Simple merge