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)
commitab213b5360e82fca707197f3224a85695645d81d
tree1ea4264228a68158226bc07a7564ade5a172400b
parent4ff0e63a015a5f88e514b924221c89b690565a2d
parente6bda9a9fd86505927a2e095e495eae104860701
Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'

* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
  libopencore-amr: Conditionally compile decoder and encoder bits

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