Commit 2220f13d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '8837f439'

* commit '8837f439':
  libopencore-amrwb: Make AMR-WB ifdeffery more precise
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents ab213b53 8837f439
...@@ -308,7 +308,7 @@ AVCodec ff_libopencore_amrnb_encoder = { ...@@ -308,7 +308,7 @@ AVCodec ff_libopencore_amrnb_encoder = {
#endif /* CONFIG_LIBOPENCORE_AMRNB */ #endif /* CONFIG_LIBOPENCORE_AMRNB */
/* -----------AMR wideband ------------*/ /* -----------AMR wideband ------------*/
#if CONFIG_LIBOPENCORE_AMRWB #if CONFIG_LIBOPENCORE_AMRWB_DECODER
#include <opencore-amrwb/dec_if.h> #include <opencore-amrwb/dec_if.h>
#include <opencore-amrwb/if_rom.h> #include <opencore-amrwb/if_rom.h>
...@@ -388,4 +388,4 @@ AVCodec ff_libopencore_amrwb_decoder = { ...@@ -388,4 +388,4 @@ AVCodec ff_libopencore_amrwb_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"), .long_name = NULL_IF_CONFIG_SMALL("OpenCORE AMR-WB (Adaptive Multi-Rate Wide-Band)"),
}; };
#endif /* CONFIG_LIBOPENCORE_AMRWB */ #endif /* CONFIG_LIBOPENCORE_AMRWB_DECODER */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment