From 36ef5369ee9b336febc2c270f8718cec4476cb85 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 5 Aug 2012 11:11:04 +0200 Subject: Replace all CODEC_ID_* with AV_CODEC_ID_* --- libavformat/4xm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/4xm.c') diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 135721fd25..e530c34a47 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -151,7 +151,7 @@ static int fourxm_read_header(AVFormatContext *s) fourxm->video_stream_index = st->index; st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = CODEC_ID_4XM; + st->codec->codec_id = AV_CODEC_ID_4XM; st->codec->extradata_size = 4; st->codec->extradata = av_malloc(4); AV_WL32(st->codec->extradata, AV_RL32(&header[i + 16])); @@ -218,11 +218,11 @@ static int fourxm_read_header(AVFormatContext *s) st->codec->bits_per_coded_sample; st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; if (fourxm->tracks[current_track].adpcm){ - st->codec->codec_id = CODEC_ID_ADPCM_4XM; + st->codec->codec_id = AV_CODEC_ID_ADPCM_4XM; }else if (st->codec->bits_per_coded_sample == 8){ - st->codec->codec_id = CODEC_ID_PCM_U8; + st->codec->codec_id = AV_CODEC_ID_PCM_U8; }else - st->codec->codec_id = CODEC_ID_PCM_S16LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; } } -- cgit v1.2.3