From b9f9e59afc4e32a326ad6b117166f0c82fd1cbac Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sat, 25 Sep 2010 23:27:16 +0000 Subject: [PATCH] Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the corresponding AVMEDIA_TYPE_* symbols. Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ansi.c | 2 +- libavcodec/libxavs.c | 2 +- libavcodec/pictordec.c | 2 +- libavcodec/ra144enc.c | 2 +- libavfilter/vf_pad.c | 2 +- libavformat/asfdec.c | 2 +- libavformat/flic.c | 2 +- libavformat/flvenc.c | 4 ++-- libavformat/rtpdec_qdm2.c | 2 +- libavformat/rtpdec_svq3.c | 2 +- libavformat/tty.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index ad85906095..8e7171c6c1 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -424,7 +424,7 @@ static av_cold int decode_close(AVCodecContext *avctx) AVCodec ansi_decoder = { .name = "ansi", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_ANSI, .priv_data_size = sizeof(AnsiContext), .init = decode_init, diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index c4ac73333b..aa5dc23bc2 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -338,7 +338,7 @@ static av_cold int XAVS_init(AVCodecContext *avctx) AVCodec libxavs_encoder = { .name = "libxavs", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_CAVS, .priv_data_size = sizeof(XavsContext), .init = XAVS_init, diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 8f46fc06e8..04667f61f2 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -239,7 +239,7 @@ static av_cold int decode_end(AVCodecContext *avctx) AVCodec pictor_decoder = { "pictor", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_PICTOR, sizeof(PicContext), NULL, diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 9e2cf36c2d..195821cddb 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -502,7 +502,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, uint8_t *frame, AVCodec ra_144_encoder = { "real_144", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_RA_144, sizeof(RA144Context), ra144_encode_init, diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c index d79baeab22..2b798cc5b4 100644 --- a/libavfilter/vf_pad.c +++ b/libavfilter/vf_pad.c @@ -456,7 +456,7 @@ AVFilter avfilter_vsrc_color = { .inputs = (AVFilterPad[]) {{ .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default", - .type = CODEC_TYPE_VIDEO, + .type = AVMEDIA_TYPE_VIDEO, .request_frame = color_request_frame, .config_props = color_config_props }, { .name = NULL}}, diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 6caffce743..6741f8ce17 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -639,7 +639,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, dar[i].num, dar[i].den, INT_MAX); - } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==CODEC_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set. + } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set. av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, dar[0].num, dar[0].den, INT_MAX); diff --git a/libavformat/flic.c b/libavformat/flic.c index 27145db086..fbdf931517 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -152,7 +152,7 @@ static int flic_read_header(AVFormatContext *s, /* all audio frames are the same size, so use the size of the first chunk for block_align */ ast->codec->block_align = AV_RL32(&preamble[0]); - ast->codec->codec_type = CODEC_TYPE_AUDIO; + ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_id = CODEC_ID_PCM_U8; ast->codec->codec_tag = 0; ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE; diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 29b7b1d1ef..e138292109 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -337,7 +337,7 @@ static int flv_write_trailer(AVFormatContext *s) /* Add EOS tag */ for (i = 0; i < s->nb_streams; i++) { AVCodecContext *enc = s->streams[i]->codec; - if (enc->codec_type == CODEC_TYPE_VIDEO && + if (enc->codec_type == AVMEDIA_TYPE_VIDEO && enc->codec_id == CODEC_ID_H264) { put_avc_eos_tag(pb, flv->last_video_ts); } @@ -405,7 +405,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } ts = pkt->dts + flv->delay; // add delay to force positive dts - if (enc->codec_type == CODEC_TYPE_VIDEO) { + if (enc->codec_type == AVMEDIA_TYPE_VIDEO) { if (flv->last_video_ts < ts) flv->last_video_ts = ts; } diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c index e9e221a7a5..bd56942c30 100644 --- a/libavformat/rtpdec_qdm2.c +++ b/libavformat/rtpdec_qdm2.c @@ -307,7 +307,7 @@ static void qdm2_extradata_free(PayloadContext *qdm) RTPDynamicProtocolHandler ff_qdm2_dynamic_handler = { "X-QDM", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, NULL, qdm2_extradata_new, diff --git a/libavformat/rtpdec_svq3.c b/libavformat/rtpdec_svq3.c index 3c4d75f085..d0c298fb59 100644 --- a/libavformat/rtpdec_svq3.c +++ b/libavformat/rtpdec_svq3.c @@ -129,7 +129,7 @@ static void svq3_extradata_free(PayloadContext *sv) RTPDynamicProtocolHandler ff_svq3_dynamic_handler = { "X-SV3V-ES", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_NONE, // see if (config_packet) above NULL, // parse sdp line svq3_extradata_new, diff --git a/libavformat/tty.c b/libavformat/tty.c index e4ed22d4c1..6aa6fa2c27 100644 --- a/libavformat/tty.c +++ b/libavformat/tty.c @@ -75,7 +75,7 @@ static int read_header(AVFormatContext *avctx, if (!st) return AVERROR(ENOMEM); st->codec->codec_tag = 0; - st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = CODEC_ID_ANSI; if (ap->width) st->codec->width = ap->width; if (ap->height) st->codec->height = ap->height;