diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-13 23:16:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-13 23:16:18 -0300 |
| commit | 1b98bfb932ad36667ea7f18e24c54978623f6654 (patch) | |
| tree | be3d5d0158dec3df7494dfe4f393b4417ec74139 | |
| parent | f3b430e0e4969b30ff6360776174c751dc003bad (diff) | |
| parent | 2a9e1c122eed66be1b26b747342b848300b226c7 (diff) | |
| download | ffmpeg-streaming-1b98bfb932ad36667ea7f18e24c54978623f6654.zip ffmpeg-streaming-1b98bfb932ad36667ea7f18e24c54978623f6654.tar.gz | |
Merge commit '2a9e1c122eed66be1b26b747342b848300b226c7'
* commit '2a9e1c122eed66be1b26b747342b848300b226c7':
libfdk-aac: Don't use defined() in a #define
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/libfdk-aacdec.c | 9 | ||||
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 86f973b..1abe1d8 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -25,10 +25,13 @@ #include "avcodec.h" #include "internal.h" +#ifdef AACDECODER_LIB_VL0 #define FDKDEC_VER_AT_LEAST(vl0, vl1) \ - (defined(AACDECODER_LIB_VL0) && \ - ((AACDECODER_LIB_VL0 > vl0) || \ - (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1))) + ((AACDECODER_LIB_VL0 > vl0) || \ + (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1)) +#else +#define FDKDEC_VER_AT_LEAST(vl0, vl1) 0 +#endif #if !FDKDEC_VER_AT_LEAST(2, 5) // < 2.5.10 #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 2d98980..5620bb5 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -26,10 +26,13 @@ #include "audio_frame_queue.h" #include "internal.h" +#ifdef AACENCODER_LIB_VL0 #define FDKENC_VER_AT_LEAST(vl0, vl1) \ - (defined(AACENCODER_LIB_VL0) && \ - ((AACENCODER_LIB_VL0 > vl0) || \ - (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))) + ((AACENCODER_LIB_VL0 > vl0) || \ + (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)) +#else +#define FDKENC_VER_AT_LEAST(vl0, vl1) 0 +#endif typedef struct AACContext { const AVClass *class; |
