Force avcodec to be at least 52.25.0 and avfomat 52.30.0...

[vlc] / modules / codec / avcodec / fourcc.c

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 9d51e582aa6d4ab3cfc8e9f1886dc28cfcda94d3..5eb13651fa9a263419d0f5b5811a1305e170d6d5 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -128,12 +128,8 @@ static const struct
     { VLC_CODEC_RV10, CODEC_ID_RV10, VIDEO_ES },
     { VLC_CODEC_RV13, CODEC_ID_RV10, VIDEO_ES },
     { VLC_CODEC_RV20, CODEC_ID_RV20, VIDEO_ES },
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 8, 0 )
     { VLC_CODEC_RV30, CODEC_ID_RV30, VIDEO_ES },
-#endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 5, 0 )
     { VLC_CODEC_RV40, CODEC_ID_RV40, VIDEO_ES },
-#endif
 
     { VLC_CODEC_RPZA, CODEC_ID_RPZA, VIDEO_ES },
 
@@ -347,9 +343,7 @@ static const struct
 
     { VLC_CODEC_VORBIS, CODEC_ID_VORBIS, AUDIO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 6, 0 )
     { VLC_CODEC_QCELP, CODEC_ID_QCELP, AUDIO_ES },
-#endif
     { VLC_CODEC_SPEEX, CODEC_ID_SPEEX, AUDIO_ES },
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 34, 0 )
     { VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES },
@@ -370,9 +364,7 @@ static const struct
 
     { VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES },
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 22, 0 )
     { VLC_CODEC_TRUEHD, CODEC_ID_TRUEHD, AUDIO_ES },
-#endif
     { VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES },