Avcodec: CODEC_ID_MP4ALS was only introduced in 52.26.0

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

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index fbec4592ea7ddfeeddbeaea5e70f2ded4a2e16e3..e55df837152b3fe1a177423bee39890a05e5e649 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -271,6 +271,9 @@ static const struct
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 35, 0 )
     { VLC_CODEC_WMAP, CODEC_ID_WMAPRO, AUDIO_ES },
 #endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 54, 0 )
+    { VLC_CODEC_WMAS, CODEC_ID_WMAVOICE, AUDIO_ES },
+#endif
 
     { VLC_CODEC_DVAUDIO, CODEC_ID_DVAUDIO, AUDIO_ES },
 
@@ -293,6 +296,9 @@ static const struct
     { VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES },
 
     { VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES },
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 26, 0 )
+    { VLC_CODEC_ALS, CODEC_ID_MP4ALS, AUDIO_ES },
+#endif
 
     { VLC_CODEC_INTERPLAY_DPCM, CODEC_ID_INTERPLAY_DPCM, AUDIO_ES },
 
@@ -338,6 +344,8 @@ static const struct
 
     { VLC_CODEC_NELLYMOSER, CODEC_ID_NELLYMOSER, AUDIO_ES },
 
+    { 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
@@ -403,14 +411,12 @@ static const struct
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 33, 0 )
     { VLC_CODEC_BD_PG, CODEC_ID_HDMV_PGS_SUBTITLE, SPU_ES },
 #endif
-#if 0
     { VLC_CODEC_SPU, CODEC_ID_DVD_SUBTITLE, SPU_ES },
     { VLC_CODEC_DVBS, CODEC_ID_DVB_SUBTITLE, SPU_ES },
     { VLC_CODEC_SUBT, CODEC_ID_TEXT, SPU_ES },
     { VLC_CODEC_XSUB, CODEC_ID_XSUB, SPU_ES },
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 50, 0 )
     { VLC_CODEC_SSA, CODEC_ID_SSA, SPU_ES },
-#endif
 #endif
 
     { 0, 0, UNKNOWN_ES }