libav: better libav version check for CODEC_ID -> AV_CODEC_ID transition

tvheadend · Aug 6, 2014 · 8200b55 · 8200b55
1 parent cfbd991
commit 8200b55
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/libav.h b/src/libav.h
@@ -29,10 +29,11 @@ Older versions of ffmpeg/libav don't have the AV_* prefix
 For version info please see:
 https://github.com/libav/libav/blob/a7153444df9040bf6ae103e0bbf6104b66f974cb/doc/APIchanges#L450-455
 https://github.com/FFmpeg/FFmpeg/blob/97478ef5fe7dd2ff8da98e381de4a6b2b979b485/doc/APIchanges#L811-816
+http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=104e10fb426f903ba9157fdbfe30292d0e4c3d72
 
 This list must be updated every time we use a new AV_CODEC_ID
 */
-#ifndef AV_CODEC_ID_NONE
+#if 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