Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:20:12 +0000 (12:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Feb 2013 11:20:16 +0000 (12:20 +0100)
commit2220f13d8227bf769aec3a699b34b1025f976c8e
tree75a0e3c14dae656f3f6e1ad24f2bf24fd31d750d
parentab213b5360e82fca707197f3224a85695645d81d
parent8837f4396a1a458a0efb07fe7daba7b847755a7a
Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'

* commit '8837f4396a1a458a0efb07fe7daba7b847755a7a':
  libopencore-amrwb: Make AMR-WB ifdeffery more precise

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