RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-11 18:09:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '2a9e1c122eed66be1b26b747342b848300b226c7'

Browse Source 
* commit '2a9e1c122eed66be1b26b747342b848300b226c7':
  libfdk-aac: Don't use defined() in a #define

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-09-13 23:16:18 -03:00
commit 1b98bfb932
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/libfdk-aacdec.c
View File

@ -25,10 +25,13 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#ifdef AACDECODER_LIB_VL0
#define FDKDEC_VER_AT_LEAST(vl0, vl1) \ #define FDKDEC_VER_AT_LEAST(vl0, vl1) \
(defined(AACDECODER_LIB_VL0) && \ ((AACDECODER_LIB_VL0 > vl0) || \
((AACDECODER_LIB_VL0 > vl0) || \ (AACDECODER_LIB_VL0 == vl0 && AACDECODER_LIB_VL1 >= vl1))
(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 #if !FDKDEC_VER_AT_LEAST(2, 5) // < 2.5.10
#define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS #define AAC_PCM_MAX_OUTPUT_CHANNELS AAC_PCM_OUTPUT_CHANNELS

9
libavcodec/libfdk-aacenc.c
View File

@ -26,10 +26,13 @@
#include "audio_frame_queue.h" #include "audio_frame_queue.h"
#include "internal.h" #include "internal.h"
#ifdef AACENCODER_LIB_VL0
#define FDKENC_VER_AT_LEAST(vl0, vl1) \ #define FDKENC_VER_AT_LEAST(vl0, vl1) \
(defined(AACENCODER_LIB_VL0) && \ ((AACENCODER_LIB_VL0 > vl0) || \
((AACENCODER_LIB_VL0 > vl0) || \ (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))
(AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1))) #else
#define FDKENC_VER_AT_LEAST(vl0, vl1) 0
#endif
typedef struct AACContext { typedef struct AACContext {
const AVClass *class; const AVClass *class;