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)
* commit '8837f4396a1a458a0efb07fe7daba7b847755a7a':
  libopencore-amrwb: Make AMR-WB ifdeffery more precise

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

Simple merge