Commit 7a4eb7be authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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.
parent cde81e52
...@@ -255,7 +255,7 @@ block_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block ) ...@@ -255,7 +255,7 @@ block_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
avcodec_flush_buffers( ctx ); avcodec_flush_buffers( ctx );
date_Set( &p_sys->end_date, 0 ); 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; p_sys->i_reject_count = 3;
goto end; goto end;
......
...@@ -392,10 +392,10 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ) ...@@ -392,10 +392,10 @@ int ffmpeg_OpenCodec( decoder_t *p_dec )
if( p_sys->p_context->extradata_size <= 0 ) if( p_sys->p_context->extradata_size <= 0 )
{ {
if( p_sys->i_codec_id == CODEC_ID_VC1 || if( p_sys->i_codec_id == AV_CODEC_ID_VC1 ||
p_sys->i_codec_id == CODEC_ID_VORBIS || p_sys->i_codec_id == AV_CODEC_ID_VORBIS ||
p_sys->i_codec_id == CODEC_ID_THEORA || p_sys->i_codec_id == AV_CODEC_ID_THEORA ||
( p_sys->i_codec_id == CODEC_ID_AAC && ( p_sys->i_codec_id == AV_CODEC_ID_AAC &&
!p_dec->fmt_in.b_packetized ) ) !p_dec->fmt_in.b_packetized ) )
{ {
msg_Warn( p_dec, "waiting for extra data for codec %s", msg_Warn( p_dec, "waiting for extra data for codec %s",
...@@ -417,7 +417,7 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ) ...@@ -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->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->bit_rate = p_dec->fmt_in.i_bitrate;
p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample; 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->bit_rate > 0 &&
p_sys->p_context->sample_rate > 0) p_sys->p_context->sample_rate > 0)
p_sys->p_context->bits_per_coded_sample = p_sys->p_context->bit_rate / p_sys->p_context->bits_per_coded_sample = p_sys->p_context->bit_rate /
......
...@@ -145,19 +145,19 @@ typedef struct { ...@@ -145,19 +145,19 @@ typedef struct {
/* XXX Prefered modes must come first */ /* XXX Prefered modes must come first */
static const dxva2_mode_t dxva2_modes[] = { static const dxva2_mode_t dxva2_modes[] = {
/* MPEG-1/2 */ /* MPEG-1/2 */
{ "MPEG-2 variable-length decoder", &DXVA2_ModeMPEG2_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, 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 motion compensation", &DXVA2_ModeMPEG2_MoComp, 0 },
{ "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 0 }, { "MPEG-2 inverse discrete cosine transform", &DXVA2_ModeMPEG2_IDCT, 0 },
{ "MPEG-1 variable-length decoder", &DXVA2_ModeMPEG1_VLD, 0 }, { "MPEG-1 variable-length decoder", &DXVA2_ModeMPEG1_VLD, 0 },
/* H.264 */ /* H.264 */
{ "H.264 variable-length decoder, film grain technology", &DXVA2_ModeH264_F, 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, 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, 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, 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, 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, film grain technology", &DXVA2_ModeH264_D, 0 },
{ "H.264 inverse discrete cosine transform, no film grain technology", &DXVA2_ModeH264_C, 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[] = { ...@@ -176,10 +176,10 @@ static const dxva2_mode_t dxva2_modes[] = {
{ "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0 }, { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0 },
/* VC-1 */ /* VC-1 */
{ "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, CODEC_ID_VC1 }, { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1 },
{ "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, CODEC_ID_WMV3 }, { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3 },
{ "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, CODEC_ID_VC1 }, { "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, AV_CODEC_ID_VC1 },
{ "VC-1 variable-length decoder", &DXVA2_ModeVC1_D2010, CODEC_ID_WMV3 }, { "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 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 0 },
{ "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 0 }, { "VC-1 variable-length decoder (Intel)", &DXVA_Intel_VC1_ClearVideo, 0 },
...@@ -865,7 +865,7 @@ static int DxCreateVideoDecoder(vlc_va_dxva2_t *va, ...@@ -865,7 +865,7 @@ static int DxCreateVideoDecoder(vlc_va_dxva2_t *va,
va->surface_width = (fmt->i_width + 15) & ~15; va->surface_width = (fmt->i_width + 15) & ~15;
va->surface_height = (fmt->i_height + 15) & ~15; va->surface_height = (fmt->i_height + 15) & ~15;
switch (codec_id) { switch (codec_id) {
case CODEC_ID_H264: case AV_CODEC_ID_H264:
va->surface_count = 16 + 1; va->surface_count = 16 + 1;
break; break;
default: default:
...@@ -950,7 +950,7 @@ static int DxCreateVideoDecoder(vlc_va_dxva2_t *va, ...@@ -950,7 +950,7 @@ static int DxCreateVideoDecoder(vlc_va_dxva2_t *va,
int score; int score;
if (cfg->ConfigBitstreamRaw == 1) if (cfg->ConfigBitstreamRaw == 1)
score = 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; score = 2;
else else
continue; continue;
......
...@@ -204,19 +204,19 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -204,19 +204,19 @@ int OpenEncoder( vlc_object_t *p_this )
if( p_enc->fmt_out.i_codec == VLC_CODEC_MP3 ) if( p_enc->fmt_out.i_codec == VLC_CODEC_MP3 )
{ {
i_cat = AUDIO_ES; i_cat = AUDIO_ES;
i_codec_id = CODEC_ID_MP3; i_codec_id = AV_CODEC_ID_MP3;
psz_namecodec = "MPEG I/II Layer 3"; psz_namecodec = "MPEG I/II Layer 3";
} }
else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP2 ) else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP2 )
{ {
i_cat = AUDIO_ES; i_cat = AUDIO_ES;
i_codec_id = CODEC_ID_MP2; i_codec_id = AV_CODEC_ID_MP2;
psz_namecodec = "MPEG I/II Layer 2"; psz_namecodec = "MPEG I/II Layer 2";
} }
else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP1V ) else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP1V )
{ {
i_cat = VIDEO_ES; i_cat = VIDEO_ES;
i_codec_id = CODEC_ID_MPEG1VIDEO; i_codec_id = AV_CODEC_ID_MPEG1VIDEO;
psz_namecodec = "MPEG-1 video"; psz_namecodec = "MPEG-1 video";
} }
else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, 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 ) ...@@ -226,7 +226,7 @@ int OpenEncoder( vlc_object_t *p_this )
return VLC_EGENERIC; /* handed chroma output */ return VLC_EGENERIC; /* handed chroma output */
i_cat = VIDEO_ES; i_cat = VIDEO_ES;
i_codec_id = CODEC_ID_RAWVIDEO; i_codec_id = AV_CODEC_ID_RAWVIDEO;
psz_namecodec = "Raw video"; psz_namecodec = "Raw video";
} }
...@@ -515,20 +515,20 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -515,20 +515,20 @@ int OpenEncoder( vlc_object_t *p_this )
See libavcodec/mpegvideo_enc.c:MPV_encode_init and See libavcodec/mpegvideo_enc.c:MPV_encode_init and
libavcodec/svq3.c , WMV2 calls MPV_encode_init also. libavcodec/svq3.c , WMV2 calls MPV_encode_init also.
*/ */
if ( i_codec_id == CODEC_ID_FLV1 || if ( i_codec_id == AV_CODEC_ID_FLV1 ||
i_codec_id == CODEC_ID_H261 || i_codec_id == AV_CODEC_ID_H261 ||
i_codec_id == CODEC_ID_LJPEG || i_codec_id == AV_CODEC_ID_LJPEG ||
i_codec_id == CODEC_ID_MJPEG || i_codec_id == AV_CODEC_ID_MJPEG ||
i_codec_id == CODEC_ID_H263 || i_codec_id == AV_CODEC_ID_H263 ||
i_codec_id == CODEC_ID_H263P || i_codec_id == AV_CODEC_ID_H263P ||
i_codec_id == CODEC_ID_MSMPEG4V1 || i_codec_id == AV_CODEC_ID_MSMPEG4V1 ||
i_codec_id == CODEC_ID_MSMPEG4V2 || i_codec_id == AV_CODEC_ID_MSMPEG4V2 ||
i_codec_id == CODEC_ID_MSMPEG4V3 || i_codec_id == AV_CODEC_ID_MSMPEG4V3 ||
i_codec_id == CODEC_ID_WMV1 || i_codec_id == AV_CODEC_ID_WMV1 ||
i_codec_id == CODEC_ID_WMV2 || i_codec_id == AV_CODEC_ID_WMV2 ||
i_codec_id == CODEC_ID_RV10 || i_codec_id == AV_CODEC_ID_RV10 ||
i_codec_id == CODEC_ID_RV20 || i_codec_id == AV_CODEC_ID_RV20 ||
i_codec_id == CODEC_ID_SVQ3 ) i_codec_id == AV_CODEC_ID_SVQ3 )
p_enc->i_threads = 1; p_enc->i_threads = 1;
if( p_sys->i_vtolerance > 0 ) if( p_sys->i_vtolerance > 0 )
...@@ -580,7 +580,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -580,7 +580,7 @@ int OpenEncoder( vlc_object_t *p_this )
else if( p_enc->fmt_in.i_cat == AUDIO_ES ) else if( p_enc->fmt_in.i_cat == AUDIO_ES )
{ {
/* work around bug in libmp3lame encoding */ /* 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_enc->fmt_in.audio.i_channels = 2;
p_context->codec_type = AVMEDIA_TYPE_AUDIO; p_context->codec_type = AVMEDIA_TYPE_AUDIO;
...@@ -626,7 +626,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -626,7 +626,7 @@ int OpenEncoder( vlc_object_t *p_this )
/* Set reasonable defaults to VP8, based on /* Set reasonable defaults to VP8, based on
libvpx-720p preset from libvpx ffmpeg-patch */ 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 */ /* Lets give bitrate tolerance */
p_context->bit_rate_tolerance = __MAX(2 * (int)p_enc->fmt_out.i_bitrate, p_sys->i_vtolerance ); 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 ) ...@@ -672,7 +672,7 @@ int OpenEncoder( vlc_object_t *p_this )
#endif #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) */ /* 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; 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 ) ...@@ -696,8 +696,8 @@ int OpenEncoder( vlc_object_t *p_this )
if( ret ) if( ret )
{ {
if( p_enc->fmt_in.i_cat == AUDIO_ES && if( p_enc->fmt_in.i_cat == AUDIO_ES &&
(p_context->channels > 2 || i_codec_id == CODEC_ID_MP2 (p_context->channels > 2 || i_codec_id == AV_CODEC_ID_MP2
|| i_codec_id == CODEC_ID_MP3) ) || i_codec_id == AV_CODEC_ID_MP3) )
{ {
if( p_context->channels > 2 ) if( p_context->channels > 2 )
{ {
...@@ -706,7 +706,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -706,7 +706,7 @@ int OpenEncoder( vlc_object_t *p_this )
msg_Warn( p_enc, "stereo mode selected (codec limitation)" ); 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; int i_frequency, i;
...@@ -767,7 +767,7 @@ int OpenEncoder( vlc_object_t *p_this ) ...@@ -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.i_extra = 4 + 1 + 3 + p_context->extradata_size;
p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra ); p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
......
...@@ -46,165 +46,165 @@ static const struct ...@@ -46,165 +46,165 @@ static const struct
* Video Codecs * Video Codecs
*/ */
{ VLC_CODEC_MPGV, CODEC_ID_MPEG2VIDEO, VIDEO_ES }, { VLC_CODEC_MPGV, AV_CODEC_ID_MPEG2VIDEO, VIDEO_ES },
{ VLC_CODEC_MPGV, CODEC_ID_MPEG1VIDEO, 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 /* 3ivx delta 3.5 Unsupported
* putting it here gives extreme distorted images * putting it here gives extreme distorted images
{ 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'), 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_DIV1, AV_CODEC_ID_MSMPEG4V1, VIDEO_ES },
{ VLC_CODEC_DIV2, CODEC_ID_MSMPEG4V2, VIDEO_ES }, { VLC_CODEC_DIV2, AV_CODEC_ID_MSMPEG4V2, VIDEO_ES },
{ VLC_CODEC_DIV3, CODEC_ID_MSMPEG4V3, VIDEO_ES }, { VLC_CODEC_DIV3, AV_CODEC_ID_MSMPEG4V3, VIDEO_ES },
{ VLC_CODEC_SVQ1, CODEC_ID_SVQ1, VIDEO_ES }, { VLC_CODEC_SVQ1, AV_CODEC_ID_SVQ1, VIDEO_ES },
{ VLC_CODEC_SVQ3, CODEC_ID_SVQ3, VIDEO_ES }, { VLC_CODEC_SVQ3, AV_CODEC_ID_SVQ3, VIDEO_ES },
{ VLC_CODEC_H264, CODEC_ID_H264, VIDEO_ES }, { VLC_CODEC_H264, AV_CODEC_ID_H264, VIDEO_ES },
{ VLC_CODEC_H263, CODEC_ID_H263, VIDEO_ES }, { VLC_CODEC_H263, AV_CODEC_ID_H263, VIDEO_ES },
{ VLC_CODEC_H263I,CODEC_ID_H263I,VIDEO_ES }, { VLC_CODEC_H263I, AV_CODEC_ID_H263I,VIDEO_ES },
{ VLC_CODEC_H263P,CODEC_ID_H263P,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_H261, AV_CODEC_ID_H261, VIDEO_ES },
{ VLC_CODEC_FLIC, CODEC_ID_FLIC, VIDEO_ES }, { VLC_CODEC_FLIC, AV_CODEC_ID_FLIC, VIDEO_ES },
{ VLC_CODEC_MJPG, CODEC_ID_MJPEG, VIDEO_ES }, { VLC_CODEC_MJPG, AV_CODEC_ID_MJPEG, VIDEO_ES },
{ VLC_CODEC_MJPGB,CODEC_ID_MJPEGB,VIDEO_ES }, { VLC_CODEC_MJPGB, AV_CODEC_ID_MJPEGB,VIDEO_ES },
{ VLC_CODEC_LJPG, CODEC_ID_LJPEG, 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_WMV1, AV_CODEC_ID_WMV1, VIDEO_ES },
{ VLC_CODEC_WMV2, CODEC_ID_WMV2, VIDEO_ES }, { VLC_CODEC_WMV2, AV_CODEC_ID_WMV2, VIDEO_ES },
{ VLC_CODEC_WMV3, CODEC_ID_WMV3, VIDEO_ES }, { VLC_CODEC_WMV3, AV_CODEC_ID_WMV3, VIDEO_ES },
{ VLC_CODEC_WMVP, CODEC_ID_WMV3, VIDEO_ES }, { VLC_CODEC_WMVP, AV_CODEC_ID_WMV3, VIDEO_ES },
{ VLC_CODEC_VC1, CODEC_ID_VC1, VIDEO_ES }, { VLC_CODEC_VC1, AV_CODEC_ID_VC1, VIDEO_ES },
{ VLC_CODEC_WMVA, CODEC_ID_VC1, VIDEO_ES }, { VLC_CODEC_WMVA, AV_CODEC_ID_VC1, VIDEO_ES },
{ VLC_CODEC_MSVIDEO1, CODEC_ID_MSVIDEO1, VIDEO_ES }, { VLC_CODEC_MSVIDEO1, AV_CODEC_ID_MSVIDEO1, VIDEO_ES },
{ VLC_CODEC_MSRLE, CODEC_ID_MSRLE, 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) */ /* 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_HUFFYUV, AV_CODEC_ID_HUFFYUV, VIDEO_ES },
{ VLC_CODEC_FFVHUFF, CODEC_ID_FFVHUFF, VIDEO_ES }, { VLC_CODEC_FFVHUFF, AV_CODEC_ID_FFVHUFF, VIDEO_ES },
{ VLC_CODEC_CYUV, CODEC_ID_CYUV, VIDEO_ES }, { VLC_CODEC_CYUV, AV_CODEC_ID_CYUV, VIDEO_ES },
{ VLC_CODEC_VP3, CODEC_ID_VP3, VIDEO_ES }, { VLC_CODEC_VP3, AV_CODEC_ID_VP3, VIDEO_ES },
{ VLC_CODEC_VP5, CODEC_ID_VP5, VIDEO_ES }, { VLC_CODEC_VP5, AV_CODEC_ID_VP5, VIDEO_ES },
{ VLC_CODEC_VP6, CODEC_ID_VP6, VIDEO_ES }, { VLC_CODEC_VP6, AV_CODEC_ID_VP6, VIDEO_ES },
{ VLC_CODEC_VP6F, CODEC_ID_VP6F, VIDEO_ES }, { VLC_CODEC_VP6F, AV_CODEC_ID_VP6F, VIDEO_ES },
{ VLC_CODEC_VP6A, CODEC_ID_VP6A, 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 ) ) #if ( !defined( WORDS_BIGENDIAN ) )
/* Asus Video (Another thing that doesn't work on PPC) */ /* Asus Video (Another thing that doesn't work on PPC) */
{ VLC_CODEC_ASV1, CODEC_ID_ASV1, VIDEO_ES }, { VLC_CODEC_ASV1, AV_CODEC_ID_ASV1, VIDEO_ES },
{ VLC_CODEC_ASV2, CODEC_ID_ASV2, VIDEO_ES }, { VLC_CODEC_ASV2, AV_CODEC_ID_ASV2, VIDEO_ES },
#endif #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 */ /* Real Video */
{ VLC_CODEC_RV10, CODEC_ID_RV10, VIDEO_ES }, { VLC_CODEC_RV10, AV_CODEC_ID_RV10, VIDEO_ES },
{ VLC_CODEC_RV13, CODEC_ID_RV10, VIDEO_ES }, { VLC_CODEC_RV13, AV_CODEC_ID_RV10, VIDEO_ES },
{ VLC_CODEC_RV20, CODEC_ID_RV20, VIDEO_ES }, { VLC_CODEC_RV20, AV_CODEC_ID_RV20, VIDEO_ES },
{ VLC_CODEC_RV30, CODEC_ID_RV30, VIDEO_ES }, { VLC_CODEC_RV30, AV_CODEC_ID_RV30, VIDEO_ES },
{ VLC_CODEC_RV40, CODEC_ID_RV40, 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_VMNC, AV_CODEC_ID_VMNC, VIDEO_ES },
{ VLC_CODEC_FRAPS, CODEC_ID_FRAPS, VIDEO_ES }, { VLC_CODEC_FRAPS, AV_CODEC_ID_FRAPS, VIDEO_ES },
{ VLC_CODEC_TRUEMOTION1, CODEC_ID_TRUEMOTION1, VIDEO_ES }, { VLC_CODEC_TRUEMOTION1, AV_CODEC_ID_TRUEMOTION1, VIDEO_ES },
{ VLC_CODEC_TRUEMOTION2, CODEC_ID_TRUEMOTION2, 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_FLASHSV, AV_CODEC_ID_FLASHSV, VIDEO_ES },
{ VLC_CODEC_KMVC, CODEC_ID_KMVC, 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 */ /* Chinese AVS - Untested */
{ VLC_CODEC_CAVS, CODEC_ID_CAVS, VIDEO_ES }, { VLC_CODEC_CAVS, AV_CODEC_ID_CAVS, VIDEO_ES },
/* Untested yet */ /* Untested yet */
{ VLC_CODEC_DNXHD, CODEC_ID_DNXHD, VIDEO_ES }, { VLC_CODEC_DNXHD, AV_CODEC_ID_DNXHD, VIDEO_ES },
{ VLC_CODEC_8BPS, CODEC_ID_8BPS, 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 ) #if LIBAVCODEC_VERSION_CHECK( 54, 27, 0, 55, 100 )
{ VLC_CODEC_MSS2, AV_CODEC_ID_MSS2, VIDEO_ES }, { VLC_CODEC_MSS2, AV_CODEC_ID_MSS2, VIDEO_ES },
...@@ -212,210 +212,210 @@ static const struct ...@@ -212,210 +212,210 @@ static const struct
/* Videogames Codecs */ /* 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_WMVP, AV_CODEC_ID_WMV3IMAGE, VIDEO_ES },
{ VLC_CODEC_WMVP2, CODEC_ID_VC1IMAGE, 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 #if 0
/* UNTESTED VideoGames*/ /* 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" }, 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" }, 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" }, 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" }, 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" }, 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" }, 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" }, 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" }, 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" }, 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" }, VIDEO_ES, "THP Video" },
#endif #endif
/* /*
* Image codecs * Image codecs
*/ */
{ VLC_CODEC_PNG, CODEC_ID_PNG, VIDEO_ES }, { VLC_CODEC_PNG, AV_CODEC_ID_PNG, VIDEO_ES },
{ VLC_CODEC_PPM, CODEC_ID_PPM, VIDEO_ES }, { VLC_CODEC_PPM, AV_CODEC_ID_PPM, VIDEO_ES },
{ VLC_CODEC_PGM, CODEC_ID_PGM, VIDEO_ES }, { VLC_CODEC_PGM, AV_CODEC_ID_PGM, VIDEO_ES },
{ VLC_CODEC_PGMYUV, CODEC_ID_PGMYUV, VIDEO_ES }, { VLC_CODEC_PGMYUV, AV_CODEC_ID_PGMYUV, VIDEO_ES },
{ VLC_CODEC_PAM, CODEC_ID_PAM, VIDEO_ES }, { VLC_CODEC_PAM, AV_CODEC_ID_PAM, VIDEO_ES },
{ VLC_CODEC_JPEGLS, CODEC_ID_JPEGLS, 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_TIFF, AV_CODEC_ID_TIFF, VIDEO_ES },
{ VLC_CODEC_GIF, CODEC_ID_GIF, VIDEO_ES }, { VLC_CODEC_GIF, AV_CODEC_ID_GIF, VIDEO_ES },
{ VLC_CODEC_TARGA, CODEC_ID_TARGA, VIDEO_ES }, { VLC_CODEC_TARGA, AV_CODEC_ID_TARGA, VIDEO_ES },
{ VLC_CODEC_SGI, CODEC_ID_SGI, VIDEO_ES }, { VLC_CODEC_SGI, AV_CODEC_ID_SGI, VIDEO_ES },
{ VLC_CODEC_JPEG2000, CODEC_ID_JPEG2000, VIDEO_ES }, { VLC_CODEC_JPEG2000, AV_CODEC_ID_JPEG2000, VIDEO_ES },
/* /*