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>
libavcodec/libopencore-amr.c

index 3b71a3b..6877f4c 100644 (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 */