videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a' 

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-18 12:20:12 +01:00
parent ab213b5360 8837f4396a
commit 2220f13d82
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/libopencore-amr.c
View File

@ -308,7 +308,7 @@ AVCodec ff_libopencore_amrnb_encoder = {
#endif /* CONFIG_LIBOPENCORE_AMRNB */
/* -----------AMR wideband ------------*/
#if CONFIG_LIBOPENCORE_AMRWB
#if CONFIG_LIBOPENCORE_AMRWB_DECODER
#include <opencore-amrwb/dec_if.h>
#include <opencore-amrwb/if_rom.h>
@ -388,4 +388,4 @@ AVCodec ff_libopencore_amrwb_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"),
};
#endif /* CONFIG_LIBOPENCORE_AMRWB */
#endif /* CONFIG_LIBOPENCORE_AMRWB_DECODER */