From 6d19440706183391b784c2659daa38e2f86417e1 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 6 Aug 2014 21:05:31 +0200 Subject: [PATCH] libav: better libav version check for CODEC_ID -> AV_CODEC_ID transition #2 --- src/libav.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libav.h b/src/libav.h index d7c7eba1..61083bf9 100644 --- a/src/libav.h +++ b/src/libav.h @@ -33,7 +33,7 @@ http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=104e10fb426f903ba9157fdbfe3 This list must be updated every time we use a new AV_CODEC_ID */ -#if LIBAVCODEC_VERSION_MAJOR < 54 && LIBAVCODEC_VERSION_MINOR < 25 +#if LIBAVCODEC_VERSION_MAJOR < 54 || (LIBAVCODEC_VERSION_MAJOR == 54 && LIBAVCODEC_VERSION_MINOR < 25) #define AVCodecID CodecID #define AV_CODEC_ID_AAC CODEC_ID_AAC #define AV_CODEC_ID_AC3 CODEC_ID_AC3