[FFmpeg-cvslog] Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 18 12:15:07 2013 +0100| [ab213b5360e82fca707197f3224a85695645d81d] | committer: Michael Niedermayer

Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'

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

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

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