mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
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:
commit
2220f13d82
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user