diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:20:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 12:20:16 +0100 |
| commit | 2220f13d8227bf769aec3a699b34b1025f976c8e (patch) | |
| tree | 75a0e3c14dae656f3f6e1ad24f2bf24fd31d750d /libavcodec/libopencore-amr.c | |
| parent | ab213b5360e82fca707197f3224a85695645d81d (diff) | |
| parent | 8837f4396a1a458a0efb07fe7daba7b847755a7a (diff) | |
| download | ffmpeg-2220f13d8227bf769aec3a699b34b1025f976c8e.tar.gz | |
Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'
* commit '8837f4396a1a458a0efb07fe7daba7b847755a7a':
libopencore-amrwb: Make AMR-WB ifdeffery more precise
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopencore-amr.c')
| -rw-r--r-- | libavcodec/libopencore-amr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 3b71a3b64b..6877f4cee5 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -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 */ |