avcodec: replace gone CODEC_ID_* with AV_CODEC_ID_*

This is necessary to compile with libav.git HEAD or with contribs.
Streaming output still needs fixing.

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 2c742209a561e4712aee53843d9d52fd024683c4..bae8a89e8dad8e6a43cb66f6af7fd116dbdbe959 100644 (file)
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -255,7 +255,7 @@ block_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
         avcodec_flush_buffers( ctx );
         date_Set( &p_sys->end_date, 0 );
 
-        if( p_sys->i_codec_id == CODEC_ID_MP2 || p_sys->i_codec_id == CODEC_ID_MP3 )
+        if( p_sys->i_codec_id == AV_CODEC_ID_MP2 || p_sys->i_codec_id == AV_CODEC_ID_MP3 )
             p_sys->i_reject_count = 3;
 
         goto end;

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 9efce6de47f36a1e77a4e30714929e897724c68e..bfd54c3c4846da0c6a47e3b75e97c10eab04e409 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -392,10 +392,10 @@ int ffmpeg_OpenCodec( decoder_t *p_dec )
 
     if( p_sys->p_context->extradata_size <= 0 )
     {
-        if( p_sys->i_codec_id == CODEC_ID_VC1 ||
-            p_sys->i_codec_id == CODEC_ID_VORBIS ||
-            p_sys->i_codec_id == CODEC_ID_THEORA ||
-            ( p_sys->i_codec_id == CODEC_ID_AAC &&
+        if( p_sys->i_codec_id == AV_CODEC_ID_VC1 ||
+            p_sys->i_codec_id == AV_CODEC_ID_VORBIS ||
+            p_sys->i_codec_id == AV_CODEC_ID_THEORA ||
+            ( p_sys->i_codec_id == AV_CODEC_ID_AAC &&
               !p_dec->fmt_in.b_packetized ) )
         {
             msg_Warn( p_dec, "waiting for extra data for codec %s",
@@ -417,7 +417,7 @@ int ffmpeg_OpenCodec( decoder_t *p_dec )
         p_sys->p_context->block_align = p_dec->fmt_in.audio.i_blockalign;
         p_sys->p_context->bit_rate = p_dec->fmt_in.i_bitrate;
         p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample;
-        if( p_sys->i_codec_id == CODEC_ID_ADPCM_G726 &&
+        if( p_sys->i_codec_id == AV_CODEC_ID_ADPCM_G726 &&
             p_sys->p_context->bit_rate > 0 &&
             p_sys->p_context->sample_rate >  0)
             p_sys->p_context->bits_per_coded_sample = p_sys->p_context->bit_rate /

diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 16dccb5f93c51b110760136e42efb85af6b6bf36..e2b0327bd357cdc78efefb92171b36e7a481335a 100644 (file)
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -145,19 +145,19 @@ typedef struct {
 /* XXX Prefered modes must come first */
 static const dxva2_mode_t dxva2_modes[] = {
     /* MPEG-1/2 */
-    { "MPEG-2 variable-length decoder",                                               &DXVA2_ModeMPEG2_VLD,                   CODEC_ID_MPEG2VIDEO },
-    { "MPEG-2 & MPEG-1 variable-length decoder",                                      &DXVA2_ModeMPEG2and1_VLD,               CODEC_ID_MPEG2VIDEO },
+    { "MPEG-2 variable-length decoder",                                               &DXVA2_ModeMPEG2_VLD,                   AV_CODEC_ID_MPEG2VIDEO },
+    { "MPEG-2 & MPEG-1 variable-length decoder",                                      &DXVA2_ModeMPEG2and1_VLD,               AV_CODEC_ID_MPEG2VIDEO },
     { "MPEG-2 motion compensation",                                                   &DXVA2_ModeMPEG2_MoComp,                0 },
     { "MPEG-2 inverse discrete cosine transform",                                     &DXVA2_ModeMPEG2_IDCT,                  0 },
 
     { "MPEG-1 variable-length decoder",                                               &DXVA2_ModeMPEG1_VLD,                   0 },
 
     /* H.264 */
-    { "H.264 variable-length decoder, film grain technology",                         &DXVA2_ModeH264_F,                      CODEC_ID_H264 },
-    { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)",   &DXVADDI_Intel_ModeH264_E,              CODEC_ID_H264 },
-    { "H.264 variable-length decoder, no film grain technology",                      &DXVA2_ModeH264_E,                      CODEC_ID_H264 },
-    { "H.264 variable-length decoder, no film grain technology, FMO/ASO",             &DXVA_ModeH264_VLD_WithFMOASO_NoFGT,    CODEC_ID_H264 },
-    { "H.264 variable-length decoder, no film grain technology, Flash",               &DXVA_ModeH264_VLD_NoFGT_Flash,         CODEC_ID_H264 },
+    { "H.264 variable-length decoder, film grain technology",                         &DXVA2_ModeH264_F,                      AV_CODEC_ID_H264 },
+    { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)",   &DXVADDI_Intel_ModeH264_E,              AV_CODEC_ID_H264 },
+    { "H.264 variable-length decoder, no film grain technology",                      &DXVA2_ModeH264_E,                      AV_CODEC_ID_H264 },
+    { "H.264 variable-length decoder, no film grain technology, FMO/ASO",             &DXVA_ModeH264_VLD_WithFMOASO_NoFGT,    AV_CODEC_ID_H264 },
+    { "H.264 variable-length decoder, no film grain technology, Flash",               &DXVA_ModeH264_VLD_NoFGT_Flash,         AV_CODEC_ID_H264 },
 
     { "H.264 inverse discrete cosine transform, film grain technology",               &DXVA2_ModeH264_D,                      0 },
     { "H.264 inverse discrete cosine transform, no film grain technology",            &DXVA2_ModeH264_C,                      0 },
@@ -176,10 +176,10 @@ static const dxva2_mode_t dxva2_modes[] = {
     { "Windows Media Video 9 post processing",                                        &DXVA2_ModeWMV9_A,                      0 },
 
     /* VC-1 */
-    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D,                       CODEC_ID_VC1 },
-    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D,                       CODEC_ID_WMV3 },
-    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D2010,                   CODEC_ID_VC1 },
-    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D2010,                   CODEC_ID_WMV3 },
+    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D,                       AV_CODEC_ID_VC1 },
+    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D,                       AV_CODEC_ID_WMV3 },
+    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D2010,                   AV_CODEC_ID_VC1 },
+    { "VC-1 variable-length decoder",                                                 &DXVA2_ModeVC1_D2010,                   AV_CODEC_ID_WMV3 },
     { "VC-1 variable-length decoder 2 (Intel)",                                       &DXVA_Intel_VC1_ClearVideo_2,           0 },
     { "VC-1 variable-length decoder (Intel)",                                         &DXVA_Intel_VC1_ClearVideo,             0 },
 
@@ -865,7 +865,7 @@ static int DxCreateVideoDecoder(vlc_va_dxva2_t *va,
     va->surface_width  = (fmt->i_width  + 15) & ~15;
     va->surface_height = (fmt->i_height + 15) & ~15;
     switch (codec_id) {
-    case CODEC_ID_H264:
+    case AV_CODEC_ID_H264:
         va->surface_count = 16 + 1;
         break;
     default:
@@ -950,7 +950,7 @@ static int DxCreateVideoDecoder(vlc_va_dxva2_t *va,
         int score;
         if (cfg->ConfigBitstreamRaw == 1)
             score = 1;
-        else if (codec_id == CODEC_ID_H264 && cfg->ConfigBitstreamRaw == 2)
+        else if (codec_id == AV_CODEC_ID_H264 && cfg->ConfigBitstreamRaw == 2)
             score = 2;
         else
             continue;

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 3416e93474875202f9186af57ab187ff16930b39..49045141333006391fa3b12768fd714a817711c4 100644 (file)
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -204,19 +204,19 @@ int OpenEncoder( vlc_object_t *p_this )
     if( p_enc->fmt_out.i_codec == VLC_CODEC_MP3 )
     {
         i_cat = AUDIO_ES;
-        i_codec_id = CODEC_ID_MP3;
+        i_codec_id = AV_CODEC_ID_MP3;
         psz_namecodec = "MPEG I/II Layer 3";
     }
     else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP2 )
     {
         i_cat = AUDIO_ES;
-        i_codec_id = CODEC_ID_MP2;
+        i_codec_id = AV_CODEC_ID_MP2;
         psz_namecodec = "MPEG I/II Layer 2";
     }
     else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP1V )
     {
         i_cat = VIDEO_ES;
-        i_codec_id = CODEC_ID_MPEG1VIDEO;
+        i_codec_id = AV_CODEC_ID_MPEG1VIDEO;
         psz_namecodec = "MPEG-1 video";
     }
     else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
@@ -226,7 +226,7 @@ int OpenEncoder( vlc_object_t *p_this )
             return VLC_EGENERIC; /* handed chroma output */
 
         i_cat      = VIDEO_ES;
-        i_codec_id = CODEC_ID_RAWVIDEO;
+        i_codec_id = AV_CODEC_ID_RAWVIDEO;
         psz_namecodec = "Raw video";
     }
 
@@ -515,20 +515,20 @@ int OpenEncoder( vlc_object_t *p_this )
            See libavcodec/mpegvideo_enc.c:MPV_encode_init and
            libavcodec/svq3.c , WMV2 calls MPV_encode_init also.
          */
-        if ( i_codec_id == CODEC_ID_FLV1 ||
-             i_codec_id == CODEC_ID_H261 ||
-             i_codec_id == CODEC_ID_LJPEG ||
-             i_codec_id == CODEC_ID_MJPEG ||
-             i_codec_id == CODEC_ID_H263 ||
-             i_codec_id == CODEC_ID_H263P ||
-             i_codec_id == CODEC_ID_MSMPEG4V1 ||
-             i_codec_id == CODEC_ID_MSMPEG4V2 ||
-             i_codec_id == CODEC_ID_MSMPEG4V3 ||
-             i_codec_id == CODEC_ID_WMV1 ||
-             i_codec_id == CODEC_ID_WMV2 ||
-             i_codec_id == CODEC_ID_RV10 ||
-             i_codec_id == CODEC_ID_RV20 ||
-             i_codec_id == CODEC_ID_SVQ3 )
+        if ( i_codec_id == AV_CODEC_ID_FLV1 ||
+             i_codec_id == AV_CODEC_ID_H261 ||
+             i_codec_id == AV_CODEC_ID_LJPEG ||
+             i_codec_id == AV_CODEC_ID_MJPEG ||
+             i_codec_id == AV_CODEC_ID_H263 ||
+             i_codec_id == AV_CODEC_ID_H263P ||
+             i_codec_id == AV_CODEC_ID_MSMPEG4V1 ||
+             i_codec_id == AV_CODEC_ID_MSMPEG4V2 ||
+             i_codec_id == AV_CODEC_ID_MSMPEG4V3 ||
+             i_codec_id == AV_CODEC_ID_WMV1 ||
+             i_codec_id == AV_CODEC_ID_WMV2 ||
+             i_codec_id == AV_CODEC_ID_RV10 ||
+             i_codec_id == AV_CODEC_ID_RV20 ||
+             i_codec_id == AV_CODEC_ID_SVQ3 )
             p_enc->i_threads = 1;
 
         if( p_sys->i_vtolerance > 0 )
@@ -580,7 +580,7 @@ int OpenEncoder( vlc_object_t *p_this )
     else if( p_enc->fmt_in.i_cat == AUDIO_ES )
     {
         /* work around bug in libmp3lame encoding */
-        if( i_codec_id == CODEC_ID_MP3 && p_enc->fmt_in.audio.i_channels > 2 )
+        if( i_codec_id == AV_CODEC_ID_MP3 && p_enc->fmt_in.audio.i_channels > 2 )
             p_enc->fmt_in.audio.i_channels = 2;
 
         p_context->codec_type  = AVMEDIA_TYPE_AUDIO;
@@ -626,7 +626,7 @@ int OpenEncoder( vlc_object_t *p_this )
 
     /* Set reasonable defaults to VP8, based on
        libvpx-720p preset from libvpx ffmpeg-patch */
-    if( i_codec_id == CODEC_ID_VP8 )
+    if( i_codec_id == AV_CODEC_ID_VP8 )
     {
         /* Lets give bitrate tolerance */
         p_context->bit_rate_tolerance = __MAX(2 * (int)p_enc->fmt_out.i_bitrate, p_sys->i_vtolerance );
@@ -672,7 +672,7 @@ int OpenEncoder( vlc_object_t *p_this )
 #endif
     }
 
-    if( i_codec_id == CODEC_ID_RAWVIDEO )
+    if( i_codec_id == AV_CODEC_ID_RAWVIDEO )
     {
         /* XXX: hack: Force same codec (will be handled by transcode) */
         p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec = p_enc->fmt_out.i_codec;
@@ -696,8 +696,8 @@ int OpenEncoder( vlc_object_t *p_this )
     if( ret )
     {
         if( p_enc->fmt_in.i_cat == AUDIO_ES &&
-             (p_context->channels > 2 || i_codec_id == CODEC_ID_MP2
-               || i_codec_id == CODEC_ID_MP3) )
+             (p_context->channels > 2 || i_codec_id == AV_CODEC_ID_MP2
+               || i_codec_id == AV_CODEC_ID_MP3) )
         {
             if( p_context->channels > 2 )
             {
@@ -706,7 +706,7 @@ int OpenEncoder( vlc_object_t *p_this )
                 msg_Warn( p_enc, "stereo mode selected (codec limitation)" );
             }
 
-            if( i_codec_id == CODEC_ID_MP2 || i_codec_id == CODEC_ID_MP3 )
+            if( i_codec_id == AV_CODEC_ID_MP2 || i_codec_id == AV_CODEC_ID_MP3 )
             {
                 int i_frequency, i;
 
@@ -767,7 +767,7 @@ int OpenEncoder( vlc_object_t *p_this )
         }
     }
 
-    if( i_codec_id == CODEC_ID_FLAC )
+    if( i_codec_id == AV_CODEC_ID_FLAC )
     {
         p_enc->fmt_out.i_extra = 4 + 1 + 3 + p_context->extradata_size;
         p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index b00269f25596342df3b4dcd368047b19abfa393d..78aaf544c46fb97d89689448b57b4bd46ba89d0d 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -46,165 +46,165 @@ static const struct
      * Video Codecs
      */
 
-    { VLC_CODEC_MPGV, CODEC_ID_MPEG2VIDEO, VIDEO_ES },
-    { VLC_CODEC_MPGV, CODEC_ID_MPEG1VIDEO, VIDEO_ES },
+    { VLC_CODEC_MPGV, AV_CODEC_ID_MPEG2VIDEO, VIDEO_ES },
+    { VLC_CODEC_MPGV, AV_CODEC_ID_MPEG1VIDEO, VIDEO_ES },
 
-    { VLC_CODEC_MP4V, CODEC_ID_MPEG4, VIDEO_ES },
+    { VLC_CODEC_MP4V, AV_CODEC_ID_MPEG4, VIDEO_ES },
     /* 3ivx delta 3.5 Unsupported
      * putting it here gives extreme distorted images
-    { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4, VIDEO_ES },
-    { VLC_FOURCC('3','i','v','1'), CODEC_ID_MPEG4, VIDEO_ES }, */
+    { VLC_FOURCC('3','I','V','1'), AV_CODEC_ID_MPEG4, VIDEO_ES },
+    { VLC_FOURCC('3','i','v','1'), AV_CODEC_ID_MPEG4, VIDEO_ES }, */
 
-    { VLC_CODEC_DIV1, CODEC_ID_MSMPEG4V1, VIDEO_ES },
-    { VLC_CODEC_DIV2, CODEC_ID_MSMPEG4V2, VIDEO_ES },
-    { VLC_CODEC_DIV3, CODEC_ID_MSMPEG4V3, VIDEO_ES },
+    { VLC_CODEC_DIV1, AV_CODEC_ID_MSMPEG4V1, VIDEO_ES },
+    { VLC_CODEC_DIV2, AV_CODEC_ID_MSMPEG4V2, VIDEO_ES },
+    { VLC_CODEC_DIV3, AV_CODEC_ID_MSMPEG4V3, VIDEO_ES },
 
-    { VLC_CODEC_SVQ1, CODEC_ID_SVQ1, VIDEO_ES },
-    { VLC_CODEC_SVQ3, CODEC_ID_SVQ3, VIDEO_ES },
+    { VLC_CODEC_SVQ1, AV_CODEC_ID_SVQ1, VIDEO_ES },
+    { VLC_CODEC_SVQ3, AV_CODEC_ID_SVQ3, VIDEO_ES },
 
-    { VLC_CODEC_H264, CODEC_ID_H264, VIDEO_ES },
-    { VLC_CODEC_H263, CODEC_ID_H263, VIDEO_ES },
-    { VLC_CODEC_H263I,CODEC_ID_H263I,VIDEO_ES },
-    { VLC_CODEC_H263P,CODEC_ID_H263P,VIDEO_ES },
+    { VLC_CODEC_H264, AV_CODEC_ID_H264, VIDEO_ES },
+    { VLC_CODEC_H263, AV_CODEC_ID_H263, VIDEO_ES },
+    { VLC_CODEC_H263I, AV_CODEC_ID_H263I,VIDEO_ES },
+    { VLC_CODEC_H263P, AV_CODEC_ID_H263P,VIDEO_ES },
 
-    { VLC_CODEC_FLV1, CODEC_ID_FLV1, VIDEO_ES },
+    { VLC_CODEC_FLV1, AV_CODEC_ID_FLV1, VIDEO_ES },
 
-    { VLC_CODEC_H261, CODEC_ID_H261, VIDEO_ES },
-    { VLC_CODEC_FLIC, CODEC_ID_FLIC, VIDEO_ES },
+    { VLC_CODEC_H261, AV_CODEC_ID_H261, VIDEO_ES },
+    { VLC_CODEC_FLIC, AV_CODEC_ID_FLIC, VIDEO_ES },
 
-    { VLC_CODEC_MJPG, CODEC_ID_MJPEG, VIDEO_ES },
-    { VLC_CODEC_MJPGB,CODEC_ID_MJPEGB,VIDEO_ES },
-    { VLC_CODEC_LJPG, CODEC_ID_LJPEG, VIDEO_ES },
+    { VLC_CODEC_MJPG, AV_CODEC_ID_MJPEG, VIDEO_ES },
+    { VLC_CODEC_MJPGB, AV_CODEC_ID_MJPEGB,VIDEO_ES },
+    { VLC_CODEC_LJPG, AV_CODEC_ID_LJPEG, VIDEO_ES },
 
-    { VLC_CODEC_SP5X, CODEC_ID_SP5X, VIDEO_ES },
+    { VLC_CODEC_SP5X, AV_CODEC_ID_SP5X, VIDEO_ES },
 
-    { VLC_CODEC_DV,   CODEC_ID_DVVIDEO, VIDEO_ES },
+    { VLC_CODEC_DV,   AV_CODEC_ID_DVVIDEO, VIDEO_ES },
 
-    { VLC_CODEC_WMV1, CODEC_ID_WMV1, VIDEO_ES },
-    { VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES },
-    { VLC_CODEC_WMV3, CODEC_ID_WMV3, VIDEO_ES },
-    { VLC_CODEC_WMVP, CODEC_ID_WMV3, VIDEO_ES },
+    { VLC_CODEC_WMV1, AV_CODEC_ID_WMV1, VIDEO_ES },
+    { VLC_CODEC_WMV2, AV_CODEC_ID_WMV2, VIDEO_ES },
+    { VLC_CODEC_WMV3, AV_CODEC_ID_WMV3, VIDEO_ES },
+    { VLC_CODEC_WMVP, AV_CODEC_ID_WMV3, VIDEO_ES },
 
-    { VLC_CODEC_VC1,  CODEC_ID_VC1, VIDEO_ES },
-    { VLC_CODEC_WMVA, CODEC_ID_VC1, VIDEO_ES },
+    { VLC_CODEC_VC1,  AV_CODEC_ID_VC1, VIDEO_ES },
+    { VLC_CODEC_WMVA, AV_CODEC_ID_VC1, VIDEO_ES },
 
-    { VLC_CODEC_MSVIDEO1, CODEC_ID_MSVIDEO1, VIDEO_ES },
-    { VLC_CODEC_MSRLE, CODEC_ID_MSRLE, VIDEO_ES },
+    { VLC_CODEC_MSVIDEO1, AV_CODEC_ID_MSVIDEO1, VIDEO_ES },
+    { VLC_CODEC_MSRLE, AV_CODEC_ID_MSRLE, VIDEO_ES },
 
-    { VLC_CODEC_INDEO2, CODEC_ID_INDEO2, VIDEO_ES },
+    { VLC_CODEC_INDEO2, AV_CODEC_ID_INDEO2, VIDEO_ES },
     /* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
-    { VLC_CODEC_INDEO3, CODEC_ID_INDEO3, VIDEO_ES },
+    { VLC_CODEC_INDEO3, AV_CODEC_ID_INDEO3, VIDEO_ES },
 
-    { VLC_CODEC_HUFFYUV, CODEC_ID_HUFFYUV, VIDEO_ES },
-    { VLC_CODEC_FFVHUFF, CODEC_ID_FFVHUFF, VIDEO_ES },
-    { VLC_CODEC_CYUV, CODEC_ID_CYUV, VIDEO_ES },
+    { VLC_CODEC_HUFFYUV, AV_CODEC_ID_HUFFYUV, VIDEO_ES },
+    { VLC_CODEC_FFVHUFF, AV_CODEC_ID_FFVHUFF, VIDEO_ES },
+    { VLC_CODEC_CYUV, AV_CODEC_ID_CYUV, VIDEO_ES },
 
-    { VLC_CODEC_VP3, CODEC_ID_VP3, VIDEO_ES },
-    { VLC_CODEC_VP5, CODEC_ID_VP5, VIDEO_ES },
-    { VLC_CODEC_VP6, CODEC_ID_VP6, VIDEO_ES },
-    { VLC_CODEC_VP6F, CODEC_ID_VP6F, VIDEO_ES },
-    { VLC_CODEC_VP6A, CODEC_ID_VP6A, VIDEO_ES },
+    { VLC_CODEC_VP3, AV_CODEC_ID_VP3, VIDEO_ES },
+    { VLC_CODEC_VP5, AV_CODEC_ID_VP5, VIDEO_ES },
+    { VLC_CODEC_VP6, AV_CODEC_ID_VP6, VIDEO_ES },
+    { VLC_CODEC_VP6F, AV_CODEC_ID_VP6F, VIDEO_ES },
+    { VLC_CODEC_VP6A, AV_CODEC_ID_VP6A, VIDEO_ES },
 
-    { VLC_CODEC_THEORA, CODEC_ID_THEORA, VIDEO_ES },
+    { VLC_CODEC_THEORA, AV_CODEC_ID_THEORA, VIDEO_ES },
 
 #if ( !defined( WORDS_BIGENDIAN ) )
     /* Asus Video (Another thing that doesn't work on PPC) */
-    { VLC_CODEC_ASV1, CODEC_ID_ASV1, VIDEO_ES },
-    { VLC_CODEC_ASV2, CODEC_ID_ASV2, VIDEO_ES },
+    { VLC_CODEC_ASV1, AV_CODEC_ID_ASV1, VIDEO_ES },
+    { VLC_CODEC_ASV2, AV_CODEC_ID_ASV2, VIDEO_ES },
 #endif
 
-    { VLC_CODEC_FFV1, CODEC_ID_FFV1, VIDEO_ES },
+    { VLC_CODEC_FFV1, AV_CODEC_ID_FFV1, VIDEO_ES },
 
-    { VLC_CODEC_VCR1, CODEC_ID_VCR1, VIDEO_ES },
+    { VLC_CODEC_VCR1, AV_CODEC_ID_VCR1, VIDEO_ES },
 
-    { VLC_CODEC_CLJR, CODEC_ID_CLJR, VIDEO_ES },
+    { VLC_CODEC_CLJR, AV_CODEC_ID_CLJR, VIDEO_ES },
 
     /* Real Video */
-    { VLC_CODEC_RV10, CODEC_ID_RV10, VIDEO_ES },
-    { VLC_CODEC_RV13, CODEC_ID_RV10, VIDEO_ES },
-    { VLC_CODEC_RV20, CODEC_ID_RV20, VIDEO_ES },
-    { VLC_CODEC_RV30, CODEC_ID_RV30, VIDEO_ES },
-    { VLC_CODEC_RV40, CODEC_ID_RV40, VIDEO_ES },
+    { VLC_CODEC_RV10, AV_CODEC_ID_RV10, VIDEO_ES },
+    { VLC_CODEC_RV13, AV_CODEC_ID_RV10, VIDEO_ES },
+    { VLC_CODEC_RV20, AV_CODEC_ID_RV20, VIDEO_ES },
+    { VLC_CODEC_RV30, AV_CODEC_ID_RV30, VIDEO_ES },
+    { VLC_CODEC_RV40, AV_CODEC_ID_RV40, VIDEO_ES },
 
-    { VLC_CODEC_RPZA, CODEC_ID_RPZA, VIDEO_ES },
+    { VLC_CODEC_RPZA, AV_CODEC_ID_RPZA, VIDEO_ES },
 
-    { VLC_CODEC_SMC, CODEC_ID_SMC, VIDEO_ES },
+    { VLC_CODEC_SMC, AV_CODEC_ID_SMC, VIDEO_ES },
 
-    { VLC_CODEC_CINEPAK, CODEC_ID_CINEPAK, VIDEO_ES },
+    { VLC_CODEC_CINEPAK, AV_CODEC_ID_CINEPAK, VIDEO_ES },
 
-    { VLC_CODEC_TSCC, CODEC_ID_TSCC, VIDEO_ES },
+    { VLC_CODEC_TSCC, AV_CODEC_ID_TSCC, VIDEO_ES },
 
-    { VLC_CODEC_CSCD, CODEC_ID_CSCD, VIDEO_ES },
+    { VLC_CODEC_CSCD, AV_CODEC_ID_CSCD, VIDEO_ES },
 
-    { VLC_CODEC_ZMBV, CODEC_ID_ZMBV, VIDEO_ES },
+    { VLC_CODEC_ZMBV, AV_CODEC_ID_ZMBV, VIDEO_ES },
 
-    { VLC_CODEC_VMNC, CODEC_ID_VMNC, VIDEO_ES },
-    { VLC_CODEC_FRAPS, CODEC_ID_FRAPS, VIDEO_ES },
+    { VLC_CODEC_VMNC, AV_CODEC_ID_VMNC, VIDEO_ES },
+    { VLC_CODEC_FRAPS, AV_CODEC_ID_FRAPS, VIDEO_ES },
 
-    { VLC_CODEC_TRUEMOTION1, CODEC_ID_TRUEMOTION1, VIDEO_ES },
-    { VLC_CODEC_TRUEMOTION2, CODEC_ID_TRUEMOTION2, VIDEO_ES },
+    { VLC_CODEC_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1, VIDEO_ES },
+    { VLC_CODEC_TRUEMOTION2, AV_CODEC_ID_TRUEMOTION2, VIDEO_ES },
 
-    { VLC_CODEC_QTRLE, CODEC_ID_QTRLE, VIDEO_ES },
+    { VLC_CODEC_QTRLE, AV_CODEC_ID_QTRLE, VIDEO_ES },
 
-    { VLC_CODEC_QDRAW, CODEC_ID_QDRAW, VIDEO_ES },
+    { VLC_CODEC_QDRAW, AV_CODEC_ID_QDRAW, VIDEO_ES },
 
-    { VLC_CODEC_QPEG, CODEC_ID_QPEG, VIDEO_ES },
+    { VLC_CODEC_QPEG, AV_CODEC_ID_QPEG, VIDEO_ES },
 
-    { VLC_CODEC_ULTI, CODEC_ID_ULTI, VIDEO_ES },
+    { VLC_CODEC_ULTI, AV_CODEC_ID_ULTI, VIDEO_ES },
 
-    { VLC_CODEC_VIXL, CODEC_ID_VIXL, VIDEO_ES },
+    { VLC_CODEC_VIXL, AV_CODEC_ID_VIXL, VIDEO_ES },
 
-    { VLC_CODEC_LOCO, CODEC_ID_LOCO, VIDEO_ES },
+    { VLC_CODEC_LOCO, AV_CODEC_ID_LOCO, VIDEO_ES },
 
-    { VLC_CODEC_WNV1, CODEC_ID_WNV1, VIDEO_ES },
+    { VLC_CODEC_WNV1, AV_CODEC_ID_WNV1, VIDEO_ES },
 
-    { VLC_CODEC_AASC, CODEC_ID_AASC, VIDEO_ES },
+    { VLC_CODEC_AASC, AV_CODEC_ID_AASC, VIDEO_ES },
 
-    { VLC_CODEC_FLASHSV, CODEC_ID_FLASHSV, VIDEO_ES },
-    { VLC_CODEC_KMVC, CODEC_ID_KMVC, VIDEO_ES },
+    { VLC_CODEC_FLASHSV, AV_CODEC_ID_FLASHSV, VIDEO_ES },
+    { VLC_CODEC_KMVC, AV_CODEC_ID_KMVC, VIDEO_ES },
 
-    { VLC_CODEC_NUV, CODEC_ID_NUV, VIDEO_ES },
+    { VLC_CODEC_NUV, AV_CODEC_ID_NUV, VIDEO_ES },
 
-    { VLC_CODEC_SMACKVIDEO, CODEC_ID_SMACKVIDEO, VIDEO_ES },
+    { VLC_CODEC_SMACKVIDEO, AV_CODEC_ID_SMACKVIDEO, VIDEO_ES },
 
     /* Chinese AVS - Untested */
-    { VLC_CODEC_CAVS, CODEC_ID_CAVS, VIDEO_ES },
+    { VLC_CODEC_CAVS, AV_CODEC_ID_CAVS, VIDEO_ES },
 
     /* Untested yet */
-    { VLC_CODEC_DNXHD, CODEC_ID_DNXHD, VIDEO_ES },
-    { VLC_CODEC_8BPS, CODEC_ID_8BPS, VIDEO_ES },
+    { VLC_CODEC_DNXHD, AV_CODEC_ID_DNXHD, VIDEO_ES },
+    { VLC_CODEC_8BPS, AV_CODEC_ID_8BPS, VIDEO_ES },
 
-    { VLC_CODEC_MIMIC, CODEC_ID_MIMIC, VIDEO_ES },
+    { VLC_CODEC_MIMIC, AV_CODEC_ID_MIMIC, VIDEO_ES },
 
-    { VLC_CODEC_DIRAC, CODEC_ID_DIRAC, VIDEO_ES },
+    { VLC_CODEC_DIRAC, AV_CODEC_ID_DIRAC, VIDEO_ES },
 
-    { VLC_CODEC_V210, CODEC_ID_V210, VIDEO_ES },
+    { VLC_CODEC_V210, AV_CODEC_ID_V210, VIDEO_ES },
 
-    { VLC_CODEC_FRWU, CODEC_ID_FRWU, VIDEO_ES },
+    { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU, VIDEO_ES },
 
-    { VLC_CODEC_INDEO5, CODEC_ID_INDEO5, VIDEO_ES },
+    { VLC_CODEC_INDEO5, AV_CODEC_ID_INDEO5, VIDEO_ES },
 
-    { VLC_CODEC_VP8, CODEC_ID_VP8, VIDEO_ES },
+    { VLC_CODEC_VP8, AV_CODEC_ID_VP8, VIDEO_ES },
 
-    { VLC_CODEC_LAGARITH, CODEC_ID_LAGARITH, VIDEO_ES },
+    { VLC_CODEC_LAGARITH, AV_CODEC_ID_LAGARITH, VIDEO_ES },
 
-    { VLC_CODEC_MXPEG, CODEC_ID_MXPEG, VIDEO_ES },
+    { VLC_CODEC_MXPEG, AV_CODEC_ID_MXPEG, VIDEO_ES },
 
-    { VLC_CODEC_VBLE, CODEC_ID_VBLE, VIDEO_ES },
+    { VLC_CODEC_VBLE, AV_CODEC_ID_VBLE, VIDEO_ES },
 
-    { VLC_CODEC_CDXL, CODEC_ID_CDXL, VIDEO_ES },
+    { VLC_CODEC_CDXL, AV_CODEC_ID_CDXL, VIDEO_ES },
 
-    { VLC_CODEC_UTVIDEO, CODEC_ID_UTVIDEO, VIDEO_ES },
+    { VLC_CODEC_UTVIDEO, AV_CODEC_ID_UTVIDEO, VIDEO_ES },
 
-    { VLC_CODEC_DXTORY, CODEC_ID_DXTORY, VIDEO_ES },
+    { VLC_CODEC_DXTORY, AV_CODEC_ID_DXTORY, VIDEO_ES },
 
-    { VLC_CODEC_MSS1, CODEC_ID_MSS1, VIDEO_ES },
+    { VLC_CODEC_MSS1, AV_CODEC_ID_MSS1, VIDEO_ES },
 
-    { VLC_CODEC_MSA1, CODEC_ID_MSA1, VIDEO_ES },
+    { VLC_CODEC_MSA1, AV_CODEC_ID_MSA1, VIDEO_ES },
 
-    { VLC_CODEC_TSC2, CODEC_ID_TSCC2, VIDEO_ES },
+    { VLC_CODEC_TSC2, AV_CODEC_ID_TSCC2, VIDEO_ES },
 
-    { VLC_CODEC_MTS2, CODEC_ID_MTS2, VIDEO_ES },
+    { VLC_CODEC_MTS2, AV_CODEC_ID_MTS2, VIDEO_ES },
 
 #if LIBAVCODEC_VERSION_CHECK( 54, 27, 0, 55, 100 )
     { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2, VIDEO_ES },
@@ -212,210 +212,210 @@ static const struct
 
     /* Videogames Codecs */
 
-    { VLC_CODEC_INTERPLAY, CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
+    { VLC_CODEC_INTERPLAY, AV_CODEC_ID_INTERPLAY_VIDEO, VIDEO_ES },
 
-    { VLC_CODEC_IDCIN, CODEC_ID_IDCIN, VIDEO_ES },
+    { VLC_CODEC_IDCIN, AV_CODEC_ID_IDCIN, VIDEO_ES },
 
-    { VLC_CODEC_4XM, CODEC_ID_4XM, VIDEO_ES },
+    { VLC_CODEC_4XM, AV_CODEC_ID_4XM, VIDEO_ES },
 
-    { VLC_CODEC_ROQ, CODEC_ID_ROQ, VIDEO_ES },
+    { VLC_CODEC_ROQ, AV_CODEC_ID_ROQ, VIDEO_ES },
 
-    { VLC_CODEC_MDEC, CODEC_ID_MDEC, VIDEO_ES },
+    { VLC_CODEC_MDEC, AV_CODEC_ID_MDEC, VIDEO_ES },
 
-    { VLC_CODEC_VMDVIDEO, CODEC_ID_VMDVIDEO, VIDEO_ES },
+    { VLC_CODEC_VMDVIDEO, AV_CODEC_ID_VMDVIDEO, VIDEO_ES },
 
-    { VLC_CODEC_AMV, CODEC_ID_AMV, VIDEO_ES },
+    { VLC_CODEC_AMV, AV_CODEC_ID_AMV, VIDEO_ES },
 
-    { VLC_CODEC_FLASHSV2, CODEC_ID_FLASHSV2, VIDEO_ES },
+    { VLC_CODEC_FLASHSV2, AV_CODEC_ID_FLASHSV2, VIDEO_ES },
 
-    { VLC_CODEC_WMVP, CODEC_ID_WMV3IMAGE, VIDEO_ES },
-    { VLC_CODEC_WMVP2, CODEC_ID_VC1IMAGE, VIDEO_ES },
+    { VLC_CODEC_WMVP, AV_CODEC_ID_WMV3IMAGE, VIDEO_ES },
+    { VLC_CODEC_WMVP2, AV_CODEC_ID_VC1IMAGE, VIDEO_ES },
 
-    { VLC_CODEC_PRORES, CODEC_ID_PRORES, VIDEO_ES },
+    { VLC_CODEC_PRORES, AV_CODEC_ID_PRORES, VIDEO_ES },
 
-    { VLC_CODEC_INDEO4, CODEC_ID_INDEO4, VIDEO_ES },
+    { VLC_CODEC_INDEO4, AV_CODEC_ID_INDEO4, VIDEO_ES },
 
-    { VLC_CODEC_BMVVIDEO, CODEC_ID_BMV_VIDEO, VIDEO_ES },
+    { VLC_CODEC_BMVVIDEO, AV_CODEC_ID_BMV_VIDEO, VIDEO_ES },
 
 #if 0
 /*    UNTESTED VideoGames*/
-    { VLC_FOURCC('W','C','3','V'), CODEC_ID_XAN_WC3,
+    { VLC_FOURCC('W','C','3','V'), AV_CODEC_ID_XAN_WC3,
       VIDEO_ES, "XAN wc3 Video" },
-    { VLC_FOURCC('W','C','4','V'), CODEC_ID_XAN_WC4,
+    { VLC_FOURCC('W','C','4','V'), AV_CODEC_ID_XAN_WC4,
       VIDEO_ES, "XAN wc4 Video" },
-    { VLC_FOURCC('S','T','3','C'), CODEC_ID_TXD,
+    { VLC_FOURCC('S','T','3','C'), AV_CODEC_ID_TXD,
       VIDEO_ES, "Renderware TeXture Dictionary" },
-    { VLC_FOURCC('V','Q','A','V'), CODEC_ID_WS_VQA,
+    { VLC_FOURCC('V','Q','A','V'), AV_CODEC_ID_WS_VQA,
       VIDEO_ES, "WestWood Vector Quantized Animation" },
-    { VLC_FOURCC('T','S','E','Q'), CODEC_ID_TIERTEXSEQVIDEO,
+    { VLC_FOURCC('T','S','E','Q'), AV_CODEC_ID_TIERTEXSEQVIDEO,
       VIDEO_ES, "Tiertex SEQ Video" },
-    { VLC_FOURCC('D','X','A','1'), CODEC_ID_DXA,
+    { VLC_FOURCC('D','X','A','1'), AV_CODEC_ID_DXA,
       VIDEO_ES, "Feeble DXA Video" },
-    { VLC_FOURCC('D','C','I','V'), CODEC_ID_DSICINVIDEO,
+    { VLC_FOURCC('D','C','I','V'), AV_CODEC_ID_DSICINVIDEO,
       VIDEO_ES, "Delphine CIN Video" },
-    { VLC_FOURCC('T','H','P','V'), CODEC_ID_THP,
+    { VLC_FOURCC('T','H','P','V'), AV_CODEC_ID_THP,
       VIDEO_ES, "THP Video" },
-    { VLC_FOURCC('B','E','T','H'), CODEC_ID_BETHSOFTVID,
+    { VLC_FOURCC('B','E','T','H'), AV_CODEC_ID_BETHSOFTVID,
       VIDEO_ES, "THP Video" },
-    { VLC_FOURCC('C','9','3','V'), CODEC_ID_C93,
+    { VLC_FOURCC('C','9','3','V'), AV_CODEC_ID_C93,
       VIDEO_ES, "THP Video" },
 #endif
 
     /*
      *  Image codecs
      */
-    { VLC_CODEC_PNG, CODEC_ID_PNG, VIDEO_ES },
-    { VLC_CODEC_PPM, CODEC_ID_PPM, VIDEO_ES },
-    { VLC_CODEC_PGM, CODEC_ID_PGM, VIDEO_ES },
-    { VLC_CODEC_PGMYUV, CODEC_ID_PGMYUV, VIDEO_ES },
-    { VLC_CODEC_PAM, CODEC_ID_PAM, VIDEO_ES },
-    { VLC_CODEC_JPEGLS, CODEC_ID_JPEGLS, VIDEO_ES },
+    { VLC_CODEC_PNG, AV_CODEC_ID_PNG, VIDEO_ES },
+    { VLC_CODEC_PPM, AV_CODEC_ID_PPM, VIDEO_ES },
+    { VLC_CODEC_PGM, AV_CODEC_ID_PGM, VIDEO_ES },
+    { VLC_CODEC_PGMYUV, AV_CODEC_ID_PGMYUV, VIDEO_ES },
+    { VLC_CODEC_PAM, AV_CODEC_ID_PAM, VIDEO_ES },
+    { VLC_CODEC_JPEGLS, AV_CODEC_ID_JPEGLS, VIDEO_ES },
 
-    { VLC_CODEC_BMP, CODEC_ID_BMP, VIDEO_ES },
+    { VLC_CODEC_BMP, AV_CODEC_ID_BMP, VIDEO_ES },
 
-    { VLC_CODEC_TIFF, CODEC_ID_TIFF, VIDEO_ES },
-    { VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES },
-    { VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES },
-    { VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES },
-    { VLC_CODEC_JPEG2000, CODEC_ID_JPEG2000, VIDEO_ES },
+    { VLC_CODEC_TIFF, AV_CODEC_ID_TIFF, VIDEO_ES },
+    { VLC_CODEC_GIF, AV_CODEC_ID_GIF, VIDEO_ES },
+    { VLC_CODEC_TARGA, AV_CODEC_ID_TARGA, VIDEO_ES },
+    { VLC_CODEC_SGI, AV_CODEC_ID_SGI, VIDEO_ES },
+    { VLC_CODEC_JPEG2000, AV_CODEC_ID_JPEG2000, VIDEO_ES },
 
     /*
      *  Audio Codecs
      */
     /* WMA family */
-    { VLC_CODEC_WMA1, CODEC_ID_WMAV1, AUDIO_ES },
-    { VLC_CODEC_WMA2, CODEC_ID_WMAV2, AUDIO_ES },
-    { VLC_CODEC_WMAP, CODEC_ID_WMAPRO, AUDIO_ES },
-    { VLC_CODEC_WMAS, CODEC_ID_WMAVOICE, AUDIO_ES },
+    { VLC_CODEC_WMA1, AV_CODEC_ID_WMAV1, AUDIO_ES },
+    { VLC_CODEC_WMA2, AV_CODEC_ID_WMAV2, AUDIO_ES },
+    { VLC_CODEC_WMAP, AV_CODEC_ID_WMAPRO, AUDIO_ES },
+    { VLC_CODEC_WMAS, AV_CODEC_ID_WMAVOICE, AUDIO_ES },
 
-    { VLC_CODEC_DVAUDIO, CODEC_ID_DVAUDIO, AUDIO_ES },
+    { VLC_CODEC_DVAUDIO, AV_CODEC_ID_DVAUDIO, AUDIO_ES },
 
-    { VLC_CODEC_MACE3, CODEC_ID_MACE3, AUDIO_ES },
-    { VLC_CODEC_MACE6, CODEC_ID_MACE6, AUDIO_ES },
+    { VLC_CODEC_MACE3, AV_CODEC_ID_MACE3, AUDIO_ES },
+    { VLC_CODEC_MACE6, AV_CODEC_ID_MACE6, AUDIO_ES },
 
-    { VLC_CODEC_MUSEPACK7, CODEC_ID_MUSEPACK7, AUDIO_ES },
-    { VLC_CODEC_MUSEPACK8, CODEC_ID_MUSEPACK8, AUDIO_ES },
+    { VLC_CODEC_MUSEPACK7, AV_CODEC_ID_MUSEPACK7, AUDIO_ES },
+    { VLC_CODEC_MUSEPACK8, AV_CODEC_ID_MUSEPACK8, AUDIO_ES },
 
-    { VLC_CODEC_RA_144, CODEC_ID_RA_144, AUDIO_ES },
-    { VLC_CODEC_RA_288, CODEC_ID_RA_288, AUDIO_ES },
+    { VLC_CODEC_RA_144, AV_CODEC_ID_RA_144, AUDIO_ES },
+    { VLC_CODEC_RA_288, AV_CODEC_ID_RA_288, AUDIO_ES },
 
-    { VLC_CODEC_A52, CODEC_ID_AC3, AUDIO_ES },
-    { VLC_CODEC_EAC3, CODEC_ID_EAC3, AUDIO_ES },
+    { VLC_CODEC_A52, AV_CODEC_ID_AC3, AUDIO_ES },
+    { VLC_CODEC_EAC3, AV_CODEC_ID_EAC3, AUDIO_ES },
 
-    { VLC_CODEC_DTS, CODEC_ID_DTS, AUDIO_ES },
+    { VLC_CODEC_DTS, AV_CODEC_ID_DTS, AUDIO_ES },
 
-    { VLC_CODEC_MPGA, CODEC_ID_MP3, AUDIO_ES },
-    { VLC_CODEC_MPGA, CODEC_ID_MP2, AUDIO_ES },
+    { VLC_CODEC_MPGA, AV_CODEC_ID_MP3, AUDIO_ES },
+    { VLC_CODEC_MPGA, AV_CODEC_ID_MP2, AUDIO_ES },
 
-    { VLC_CODEC_MP4A, CODEC_ID_AAC, AUDIO_ES },
-    { VLC_CODEC_ALS, CODEC_ID_MP4ALS, AUDIO_ES },
-    { VLC_CODEC_MP4A, CODEC_ID_AAC_LATM, AUDIO_ES },
+    { VLC_CODEC_MP4A, AV_CODEC_ID_AAC, AUDIO_ES },
+    { VLC_CODEC_ALS, AV_CODEC_ID_MP4ALS, AUDIO_ES },
+    { VLC_CODEC_MP4A, AV_CODEC_ID_AAC_LATM, AUDIO_ES },
 
-    { VLC_CODEC_INTERPLAY_DPCM, CODEC_ID_INTERPLAY_DPCM, AUDIO_ES },
+    { VLC_CODEC_INTERPLAY_DPCM, AV_CODEC_ID_INTERPLAY_DPCM, AUDIO_ES },
 
-    { VLC_CODEC_ROQ_DPCM, CODEC_ID_ROQ_DPCM, AUDIO_ES },
+    { VLC_CODEC_ROQ_DPCM, AV_CODEC_ID_ROQ_DPCM, AUDIO_ES },
 
-    { VLC_CODEC_DSICINAUDIO, CODEC_ID_DSICINAUDIO, AUDIO_ES },
+    { VLC_CODEC_DSICINAUDIO, AV_CODEC_ID_DSICINAUDIO, AUDIO_ES },
 
-    { VLC_CODEC_ADPCM_4XM, CODEC_ID_ADPCM_4XM, AUDIO_ES },
-    { VLC_CODEC_ADPCM_EA, CODEC_ID_ADPCM_EA, AUDIO_ES },
-    { VLC_CODEC_ADPCM_XA, CODEC_ID_ADPCM_XA, AUDIO_ES },
-    { VLC_CODEC_ADPCM_ADX, CODEC_ID_ADPCM_ADX, AUDIO_ES },
-    { VLC_CODEC_ADPCM_IMA_WS, CODEC_ID_ADPCM_IMA_WS, AUDIO_ES },
-    { VLC_CODEC_ADPCM_MS, CODEC_ID_ADPCM_MS, AUDIO_ES },
-    { VLC_CODEC_ADPCM_IMA_WAV, CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES },
-    { VLC_CODEC_ADPCM_IMA_AMV, CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
-    { VLC_CODEC_ADPCM_IMA_QT, CODEC_ID_ADPCM_IMA_QT, AUDIO_ES },
-    { VLC_CODEC_ADPCM_YAMAHA, CODEC_ID_ADPCM_YAMAHA, AUDIO_ES },
+    { VLC_CODEC_ADPCM_4XM, AV_CODEC_ID_ADPCM_4XM, AUDIO_ES },
+    { VLC_CODEC_ADPCM_EA, AV_CODEC_ID_ADPCM_EA, AUDIO_ES },
+    { VLC_CODEC_ADPCM_XA, AV_CODEC_ID_ADPCM_XA, AUDIO_ES },
+    { VLC_CODEC_ADPCM_ADX, AV_CODEC_ID_ADPCM_ADX, AUDIO_ES },
+    { VLC_CODEC_ADPCM_IMA_WS, AV_CODEC_ID_ADPCM_IMA_WS, AUDIO_ES },
+    { VLC_CODEC_ADPCM_MS, AV_CODEC_ID_ADPCM_MS, AUDIO_ES },
+    { VLC_CODEC_ADPCM_IMA_WAV, AV_CODEC_ID_ADPCM_IMA_WAV, AUDIO_ES },
+    { VLC_CODEC_ADPCM_IMA_AMV, AV_CODEC_ID_ADPCM_IMA_AMV, AUDIO_ES },
+    { VLC_CODEC_ADPCM_IMA_QT, AV_CODEC_ID_ADPCM_IMA_QT, AUDIO_ES },
+    { VLC_CODEC_ADPCM_YAMAHA, AV_CODEC_ID_ADPCM_YAMAHA, AUDIO_ES },
 
-    { VLC_CODEC_VMDAUDIO, CODEC_ID_VMDAUDIO, AUDIO_ES },
+    { VLC_CODEC_VMDAUDIO, AV_CODEC_ID_VMDAUDIO, AUDIO_ES },
 
-    { VLC_CODEC_ADPCM_G726, CODEC_ID_ADPCM_G726, AUDIO_ES },
-    { VLC_CODEC_ADPCM_SWF, CODEC_ID_ADPCM_SWF, AUDIO_ES },
+    { VLC_CODEC_ADPCM_G726, AV_CODEC_ID_ADPCM_G726, AUDIO_ES },
+    { VLC_CODEC_ADPCM_SWF, AV_CODEC_ID_ADPCM_SWF, AUDIO_ES },
 
-    { VLC_CODEC_AMR_NB, CODEC_ID_AMR_NB, AUDIO_ES },
-    { VLC_CODEC_AMR_WB, CODEC_ID_AMR_WB, AUDIO_ES },
+    { VLC_CODEC_AMR_NB, AV_CODEC_ID_AMR_NB, AUDIO_ES },
+    { VLC_CODEC_AMR_WB, AV_CODEC_ID_AMR_WB, AUDIO_ES },
 
-    { VLC_CODEC_GSM, CODEC_ID_GSM, AUDIO_ES },
-    { VLC_CODEC_GSM_MS, CODEC_ID_GSM_MS, AUDIO_ES },
+    { VLC_CODEC_GSM, AV_CODEC_ID_GSM, AUDIO_ES },
+    { VLC_CODEC_GSM_MS, AV_CODEC_ID_GSM_MS, AUDIO_ES },
 
-    { VLC_CODEC_QDM2, CODEC_ID_QDM2, AUDIO_ES },
+    { VLC_CODEC_QDM2, AV_CODEC_ID_QDM2, AUDIO_ES },
 
-    { VLC_CODEC_COOK, CODEC_ID_COOK, AUDIO_ES },
+    { VLC_CODEC_COOK, AV_CODEC_ID_COOK, AUDIO_ES },
 
-    { VLC_CODEC_TTA, CODEC_ID_TTA, AUDIO_ES },
+    { VLC_CODEC_TTA, AV_CODEC_ID_TTA, AUDIO_ES },
 
-    { VLC_CODEC_WAVPACK, CODEC_ID_WAVPACK, AUDIO_ES },
+    { VLC_CODEC_WAVPACK, AV_CODEC_ID_WAVPACK, AUDIO_ES },
 
-    { VLC_CODEC_ATRAC3, CODEC_ID_ATRAC3, AUDIO_ES },
+    { VLC_CODEC_ATRAC3, AV_CODEC_ID_ATRAC3, AUDIO_ES },
 
-    { VLC_CODEC_IMC, CODEC_ID_IMC, AUDIO_ES },
+    { VLC_CODEC_IMC, AV_CODEC_ID_IMC, AUDIO_ES },
 
-    { VLC_CODEC_TRUESPEECH, CODEC_ID_TRUESPEECH, AUDIO_ES },
+    { VLC_CODEC_TRUESPEECH, AV_CODEC_ID_TRUESPEECH, AUDIO_ES },
 
-    { VLC_CODEC_NELLYMOSER, CODEC_ID_NELLYMOSER, AUDIO_ES },
+    { VLC_CODEC_NELLYMOSER, AV_CODEC_ID_NELLYMOSER, AUDIO_ES },
 
-    { VLC_CODEC_VORBIS, CODEC_ID_VORBIS, AUDIO_ES },
+    { VLC_CODEC_VORBIS, AV_CODEC_ID_VORBIS, AUDIO_ES },
 
-    { VLC_CODEC_QCELP, CODEC_ID_QCELP, AUDIO_ES },
-    { VLC_CODEC_SPEEX, CODEC_ID_SPEEX, AUDIO_ES },
-    { VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES },
-    { VLC_CODEC_ATRAC1, CODEC_ID_ATRAC1, AUDIO_ES },
-    { VLC_CODEC_SIPR, CODEC_ID_SIPR, AUDIO_ES },
-    { VLC_CODEC_ADPCM_G722, CODEC_ID_ADPCM_G722, AUDIO_ES },
-    { VLC_CODEC_BMVAUDIO, CODEC_ID_BMV_AUDIO, AUDIO_ES },
+    { VLC_CODEC_QCELP, AV_CODEC_ID_QCELP, AUDIO_ES },
+    { VLC_CODEC_SPEEX, AV_CODEC_ID_SPEEX, AUDIO_ES },
+    { VLC_CODEC_TWINVQ, AV_CODEC_ID_TWINVQ, AUDIO_ES },
+    { VLC_CODEC_ATRAC1, AV_CODEC_ID_ATRAC1, AUDIO_ES },
+    { VLC_CODEC_SIPR, AV_CODEC_ID_SIPR, AUDIO_ES },
+    { VLC_CODEC_ADPCM_G722, AV_CODEC_ID_ADPCM_G722, AUDIO_ES },
+    { VLC_CODEC_BMVAUDIO, AV_CODEC_ID_BMV_AUDIO, AUDIO_ES },
 
-    { VLC_CODEC_G723_1, CODEC_ID_G723_1, AUDIO_ES },
+    { VLC_CODEC_G723_1, AV_CODEC_ID_G723_1, AUDIO_ES },
 
     /* Lossless */
-    { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
+    { VLC_CODEC_FLAC, AV_CODEC_ID_FLAC, AUDIO_ES },
 
-    { VLC_CODEC_ALAC, CODEC_ID_ALAC, AUDIO_ES },
+    { VLC_CODEC_ALAC, AV_CODEC_ID_ALAC, AUDIO_ES },
 
-    { VLC_CODEC_APE, CODEC_ID_APE, AUDIO_ES },
+    { VLC_CODEC_APE, AV_CODEC_ID_APE, AUDIO_ES },
 
-    { VLC_CODEC_SHORTEN, CODEC_ID_SHORTEN, AUDIO_ES },
+    { VLC_CODEC_SHORTEN, AV_CODEC_ID_SHORTEN, AUDIO_ES },
 
-    { VLC_CODEC_TRUEHD, CODEC_ID_TRUEHD, AUDIO_ES },
-    { VLC_CODEC_MLP, CODEC_ID_MLP, AUDIO_ES },
+    { VLC_CODEC_TRUEHD, AV_CODEC_ID_TRUEHD, AUDIO_ES },
+    { VLC_CODEC_MLP, AV_CODEC_ID_MLP, AUDIO_ES },
 
-    { VLC_CODEC_WMAL, CODEC_ID_WMALOSSLESS, AUDIO_ES },
+    { VLC_CODEC_WMAL, AV_CODEC_ID_WMALOSSLESS, AUDIO_ES },
 
-    { VLC_CODEC_RALF, CODEC_ID_RALF, AUDIO_ES },
+    { VLC_CODEC_RALF, AV_CODEC_ID_RALF, AUDIO_ES },
 
-    { VLC_CODEC_INDEO_AUDIO, CODEC_ID_IAC, AUDIO_ES },
+    { VLC_CODEC_INDEO_AUDIO, AV_CODEC_ID_IAC, AUDIO_ES },
 
     /* PCM */
-    { VLC_CODEC_S8, CODEC_ID_PCM_S8, AUDIO_ES },
-    { VLC_CODEC_U8, CODEC_ID_PCM_U8, AUDIO_ES },
-    { VLC_CODEC_S16L, CODEC_ID_PCM_S16LE, AUDIO_ES },
-    { VLC_CODEC_S16B, CODEC_ID_PCM_S16BE, AUDIO_ES },
-    { VLC_CODEC_U16L, CODEC_ID_PCM_U16LE, AUDIO_ES },
-    { VLC_CODEC_U16B, CODEC_ID_PCM_U16BE, AUDIO_ES },
-    { VLC_CODEC_S24L, CODEC_ID_PCM_S24LE, AUDIO_ES },
-    { VLC_CODEC_S24B, CODEC_ID_PCM_S24BE, AUDIO_ES },
-    { VLC_CODEC_U24L, CODEC_ID_PCM_U24LE, AUDIO_ES },
-    { VLC_CODEC_U24B, CODEC_ID_PCM_U24BE, AUDIO_ES },
-    { VLC_CODEC_S32L, CODEC_ID_PCM_S32LE, AUDIO_ES },
-    { VLC_CODEC_S32B, CODEC_ID_PCM_S32BE, AUDIO_ES },
-    { VLC_CODEC_U32L, CODEC_ID_PCM_U32LE, AUDIO_ES },
-    { VLC_CODEC_U32B, CODEC_ID_PCM_U32BE, AUDIO_ES },
-    { VLC_CODEC_ALAW, CODEC_ID_PCM_ALAW, AUDIO_ES },
-    { VLC_CODEC_MULAW, CODEC_ID_PCM_MULAW, AUDIO_ES },
-    { VLC_CODEC_S24DAUD, CODEC_ID_PCM_S24DAUD, AUDIO_ES },
-    { VLC_CODEC_F32L, CODEC_ID_PCM_F32LE, AUDIO_ES },
-    { VLC_CODEC_F64L, CODEC_ID_PCM_F64LE, AUDIO_ES },
-    { VLC_CODEC_F32B, CODEC_ID_PCM_F32BE, AUDIO_ES },
-    { VLC_CODEC_F64B, CODEC_ID_PCM_F64BE, AUDIO_ES },
+    { VLC_CODEC_S8, AV_CODEC_ID_PCM_S8, AUDIO_ES },
+    { VLC_CODEC_U8, AV_CODEC_ID_PCM_U8, AUDIO_ES },
+    { VLC_CODEC_S16L, AV_CODEC_ID_PCM_S16LE, AUDIO_ES },
+    { VLC_CODEC_S16B, AV_CODEC_ID_PCM_S16BE, AUDIO_ES },
+    { VLC_CODEC_U16L, AV_CODEC_ID_PCM_U16LE, AUDIO_ES },
+    { VLC_CODEC_U16B, AV_CODEC_ID_PCM_U16BE, AUDIO_ES },
+    { VLC_CODEC_S24L, AV_CODEC_ID_PCM_S24LE, AUDIO_ES },
+    { VLC_CODEC_S24B, AV_CODEC_ID_PCM_S24BE, AUDIO_ES },
+    { VLC_CODEC_U24L, AV_CODEC_ID_PCM_U24LE, AUDIO_ES },
+    { VLC_CODEC_U24B, AV_CODEC_ID_PCM_U24BE, AUDIO_ES },
+    { VLC_CODEC_S32L, AV_CODEC_ID_PCM_S32LE, AUDIO_ES },
+    { VLC_CODEC_S32B, AV_CODEC_ID_PCM_S32BE, AUDIO_ES },
+    { VLC_CODEC_U32L, AV_CODEC_ID_PCM_U32LE, AUDIO_ES },
+    { VLC_CODEC_U32B, AV_CODEC_ID_PCM_U32BE, AUDIO_ES },
+    { VLC_CODEC_ALAW, AV_CODEC_ID_PCM_ALAW, AUDIO_ES },
+    { VLC_CODEC_MULAW, AV_CODEC_ID_PCM_MULAW, AUDIO_ES },
+    { VLC_CODEC_S24DAUD, AV_CODEC_ID_PCM_S24DAUD, AUDIO_ES },
+    { VLC_CODEC_F32L, AV_CODEC_ID_PCM_F32LE, AUDIO_ES },
+    { VLC_CODEC_F64L, AV_CODEC_ID_PCM_F64LE, AUDIO_ES },
+    { VLC_CODEC_F32B, AV_CODEC_ID_PCM_F32BE, AUDIO_ES },
+    { VLC_CODEC_F64B, AV_CODEC_ID_PCM_F64BE, AUDIO_ES },
 
     /* Subtitle streams */
-    { VLC_CODEC_BD_PG, CODEC_ID_HDMV_PGS_SUBTITLE, SPU_ES },
-    { 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 },
-    { VLC_CODEC_SSA, CODEC_ID_SSA, SPU_ES },
-    { VLC_CODEC_TELETEXT, CODEC_ID_DVB_TELETEXT, SPU_ES },
+    { VLC_CODEC_BD_PG, AV_CODEC_ID_HDMV_PGS_SUBTITLE, SPU_ES },
+    { VLC_CODEC_SPU, AV_CODEC_ID_DVD_SUBTITLE, SPU_ES },
+    { VLC_CODEC_DVBS, AV_CODEC_ID_DVB_SUBTITLE, SPU_ES },
+    { VLC_CODEC_SUBT, AV_CODEC_ID_TEXT, SPU_ES },
+    { VLC_CODEC_XSUB, AV_CODEC_ID_XSUB, SPU_ES },
+    { VLC_CODEC_SSA, AV_CODEC_ID_SSA, SPU_ES },
+    { VLC_CODEC_TELETEXT, AV_CODEC_ID_DVB_TELETEXT, SPU_ES },
 
     { 0, 0, UNKNOWN_ES }
 };

diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index 31a7b88c6c23247ee43300efd4442215c58dff8f..a1543efd0db5d285ef6a9338afaf09585290d441 100644 (file)
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -54,8 +54,8 @@ int InitSubtitleDec(decoder_t *dec, AVCodecContext *context,
 
     /* */
     switch (codec_id) {
-    case CODEC_ID_HDMV_PGS_SUBTITLE:
-    case CODEC_ID_XSUB:
+    case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
+    case AV_CODEC_ID_XSUB:
         break;
     default:
         msg_Warn(dec, "refusing to decode non validated subtitle codec");

diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index bcfaeec27ff55f629d5cb44cec79d24c4b72c3d4..893ea153131765bc98e6c51baf66c482cd24e8eb 100644 (file)
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -104,24 +104,24 @@ static int Open( vlc_va_t *p_external, int i_codec_id )
     /* */
     switch( i_codec_id )
     {
-    case CODEC_ID_MPEG1VIDEO:
-    case CODEC_ID_MPEG2VIDEO:
+    case AV_CODEC_ID_MPEG1VIDEO:
+    case AV_CODEC_ID_MPEG2VIDEO:
         i_profile = VAProfileMPEG2Main;
         i_surface_count = 2+1;
         break;
-    case CODEC_ID_MPEG4:
+    case AV_CODEC_ID_MPEG4:
         i_profile = VAProfileMPEG4AdvancedSimple;
         i_surface_count = 2+1;
         break;
-    case CODEC_ID_WMV3:
+    case AV_CODEC_ID_WMV3:
         i_profile = VAProfileVC1Main;
         i_surface_count = 2+1;
         break;
-    case CODEC_ID_VC1:
+    case AV_CODEC_ID_VC1:
         i_profile = VAProfileVC1Advanced;
         i_surface_count = 2+1;
         break;
-    case CODEC_ID_H264:
+    case AV_CODEC_ID_H264:
         i_profile = VAProfileH264High;
         i_surface_count = 16+1;
         break;

diff --git a/modules/codec/avcodec/vda.c b/modules/codec/avcodec/vda.c
index d82778cc4af8b8fda00e14dc487b1f1076b4f19f..de4b88dd62b0b59d037130e4af4c2c6f6086f2fe 100644 (file)
--- a/modules/codec/avcodec/vda.c
+++ b/modules/codec/avcodec/vda.c
@@ -264,7 +264,7 @@ static void Close( vlc_va_t *p_external )
 
 static int Open( vlc_va_t *external, int i_codec_id, const es_format_t *fmt )
 {
-    if( i_codec_id != CODEC_ID_H264 )
+    if( i_codec_id != AV_CODEC_ID_H264 )
         return NULL;
 
     if( fmt->p_extra == NULL || fmt->i_extra < 7 )

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 5c4a3a713e454654fbac6af8f283b71bcce9e216..480dc1e0eea60469f858fcc6e47a58c7d842beb0 100644 (file)
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -287,8 +287,8 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
     if( var_CreateGetBool( p_dec, "avcodec-dr" ) &&
        (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
         /* No idea why ... but this fixes flickering on some TSCC streams */
-        p_sys->i_codec_id != CODEC_ID_TSCC && p_sys->i_codec_id != CODEC_ID_CSCD &&
-        p_sys->i_codec_id != CODEC_ID_CINEPAK &&
+        p_sys->i_codec_id != AV_CODEC_ID_TSCC && p_sys->i_codec_id != AV_CODEC_ID_CSCD &&
+        p_sys->i_codec_id != AV_CODEC_ID_CINEPAK &&
         !p_sys->p_context->debug_mv )
     {
         /* Some codecs set pix_fmt only after the 1st frame has been decoded,
@@ -333,10 +333,10 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
 
     char *hw = var_CreateGetString( p_dec, "avcodec-hw" ); /* FIXME */
     if( (hw == NULL || strcasecmp( hw, "none" )) &&
-        (i_codec_id == CODEC_ID_MPEG1VIDEO || i_codec_id == CODEC_ID_MPEG2VIDEO ||
-         i_codec_id == CODEC_ID_MPEG4 ||
-         i_codec_id == CODEC_ID_H264 ||
-         i_codec_id == CODEC_ID_VC1 || i_codec_id == CODEC_ID_WMV3) )
+        (i_codec_id == AV_CODEC_ID_MPEG1VIDEO || i_codec_id == AV_CODEC_ID_MPEG2VIDEO ||
+         i_codec_id == AV_CODEC_ID_MPEG4 ||
+         i_codec_id == AV_CODEC_ID_H264 ||
+         i_codec_id == AV_CODEC_ID_VC1 || i_codec_id == AV_CODEC_ID_WMV3) )
     {
 #ifdef HAVE_AVCODEC_MT
         if( p_sys->p_context->thread_type & FF_THREAD_FRAME )
@@ -345,7 +345,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
             p_sys->p_context->thread_type &= ~FF_THREAD_FRAME;
         }
         if( ( p_sys->p_context->thread_type & FF_THREAD_SLICE ) &&
-            ( i_codec_id == CODEC_ID_MPEG1VIDEO || i_codec_id == CODEC_ID_MPEG2VIDEO ) )
+            ( i_codec_id == AV_CODEC_ID_MPEG1VIDEO || i_codec_id == AV_CODEC_ID_MPEG2VIDEO ) )
         {
             msg_Warn( p_dec, "threaded slice decoding is not compatible with libavcodec-hw, disabled" );
             p_sys->p_context->thread_type &= ~FF_THREAD_SLICE;
@@ -377,7 +377,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
     p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma;
 
     /* Setup palette */
-# warning FIXME
+# warning FIXME: palette
 
     /* ***** init this codec with special data ***** */
     ffmpeg_InitCodec( p_dec );
@@ -800,7 +800,7 @@ static void ffmpeg_InitCodec( decoder_t *p_dec )
 
     if( !i_size ) return;
 
-    if( p_sys->i_codec_id == CODEC_ID_SVQ3 )
+    if( p_sys->i_codec_id == AV_CODEC_ID_SVQ3 )
     {
         uint8_t *p;
 
@@ -970,11 +970,11 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
         unsigned i_align;
         switch( p_sys->i_codec_id )
         {
-        case CODEC_ID_SVQ1:
-        case CODEC_ID_VP5:
-        case CODEC_ID_VP6:
-        case CODEC_ID_VP6F:
-        case CODEC_ID_VP6A:
+        case AV_CODEC_ID_SVQ1:
+        case AV_CODEC_ID_VP5:
+        case AV_CODEC_ID_VP6:
+        case AV_CODEC_ID_VP6F:
+        case AV_CODEC_ID_VP6A:
             i_align = 16;
             break;
         default:

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index b072435067dc66e13fe7e045b4aefcdb6ffcec9a..00e826b651a8ed3703a4b4129008e11462486138 100644 (file)
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -308,7 +308,7 @@ int OpenDemux( vlc_object_t *p_this )
             es_format_Init( &fmt, VIDEO_ES, fcc );
 
             /* Special case for raw video data */
-            if( cc->codec_id == CODEC_ID_RAWVIDEO )
+            if( cc->codec_id == AV_CODEC_ID_RAWVIDEO )
             {
                 msg_Dbg( p_demux, "raw video, pixel format: %i", cc->pix_fmt );
                 if( GetVlcChroma( &fmt.video, cc->pix_fmt ) != VLC_SUCCESS)
@@ -319,7 +319,7 @@ int OpenDemux( vlc_object_t *p_this )
                     fmt.i_codec = fmt.video.i_chroma;
             }
             /* We need this for the h264 packetizer */
-            else if( cc->codec_id == CODEC_ID_H264 && ( p_sys->fmt == av_find_input_format("flv") ||
+            else if( cc->codec_id == AV_CODEC_ID_H264 && ( p_sys->fmt == av_find_input_format("flv") ||
                 p_sys->fmt == av_find_input_format("matroska") || p_sys->fmt == av_find_input_format("mp4") ) )
                 fmt.i_original_fourcc = VLC_FOURCC( 'a', 'v', 'c', '1' );
 
@@ -334,7 +334,7 @@ int OpenDemux( vlc_object_t *p_this )
         case AVMEDIA_TYPE_SUBTITLE:
             es_format_Init( &fmt, SPU_ES, fcc );
             if( strncmp( p_sys->ic->iformat->name, "matroska", 8 ) == 0 &&
-                cc->codec_id == CODEC_ID_DVD_SUBTITLE &&
+                cc->codec_id == AV_CODEC_ID_DVD_SUBTITLE &&
                 cc->extradata != NULL &&
                 cc->extradata_size > 0 )
             {
@@ -386,7 +386,7 @@ int OpenDemux( vlc_object_t *p_this )
                 input_attachment_t *p_attachment;
 
                 psz_type = "attachment";
-                if( cc->codec_id == CODEC_ID_TTF )
+                if( cc->codec_id == AV_CODEC_ID_TTF )
                 {
                     AVDictionaryEntry *filename = av_dict_get( s->metadata, "filename", NULL, 0 );
                     if( filename && filename->value )
@@ -427,7 +427,7 @@ int OpenDemux( vlc_object_t *p_this )
             const uint8_t *p_extra = cc->extradata;
             unsigned      i_extra  = cc->extradata_size;
 
-            if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
+            if( cc->codec_id == AV_CODEC_ID_THEORA && b_ogg )
             {
                 unsigned pi_size[3];
                 const void *pp_data[3];
@@ -451,7 +451,7 @@ int OpenDemux( vlc_object_t *p_this )
                     fmt.p_extra = NULL;
                 }
             }
-            else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
+            else if( cc->codec_id == AV_CODEC_ID_SPEEX && b_ogg )
             {
                 const uint8_t p_dummy_comment[] = {
                     0, 0, 0, 0,
@@ -597,7 +597,7 @@ static int Demux( demux_t *p_demux )
         av_free_packet( &pkt );
         return 1;
     }
-    if( p_stream->codec->codec_id == CODEC_ID_SSA )
+    if( p_stream->codec->codec_id == AV_CODEC_ID_SSA )
     {
         p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ );
         if( !p_frame )

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 56596b87c41d864390d21deff81ff062ab0a4b96..d15efe9d80afc1c029d43cde1a9b78a45f1790f2 100644 (file)
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -230,9 +230,9 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
 
     codec->bit_rate = p_input->p_fmt->i_bitrate;
     codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id );
-    if( !codec->codec_tag && i_codec_id == CODEC_ID_MP2 )
+    if( !codec->codec_tag && i_codec_id == AV_CODEC_ID_MP2 )
     {
-        i_codec_id = CODEC_ID_MP3;
+        i_codec_id = AV_CODEC_ID_MP3;
         codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id );
     }
     codec->codec_id = i_codec_id;

diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c
index b871bc1134fcddecc26af529112f4a91003e3070..1f957a94d0fcdfd1d814aa419d0ebba75c5dfaba 100644 (file)
--- a/modules/stream_out/switcher.c
+++ b/modules/stream_out/switcher.c
@@ -339,7 +339,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
               p_fmt->i_codec == VLC_CODEC_MPGA &&
               p_sys->b_audio )
     {
-        int i_ff_codec = CODEC_ID_MP2;
+        int i_ff_codec = AV_CODEC_ID_MP2;
         int i;
 
         id->b_switcher_audio = true;
@@ -725,7 +725,7 @@ static mtime_t VideoCommand( sout_stream_t *p_stream, sout_stream_id_t *id )
     if ( p_sys->i_cmd > 0 )
     {
         /* Create a new encoder. */
-        int i_ff_codec = CODEC_ID_MPEG2VIDEO;
+        int i_ff_codec = AV_CODEC_ID_MPEG2VIDEO;
         int i_aspect_num, i_aspect_den;
 
         if( i_ff_codec == 0 )