diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 13:11:04 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 18:00:24 +0400 |
commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavformat/segafilm.c | |
parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/segafilm.c')
-rw-r--r-- | libavformat/segafilm.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index bb26cf69e4..23eea64956 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -49,12 +49,12 @@ typedef struct FilmDemuxContext { int video_stream_index; int audio_stream_index; - enum CodecID audio_type; + enum AVCodecID audio_type; unsigned int audio_samplerate; unsigned int audio_bits; unsigned int audio_channels; - enum CodecID video_type; + enum AVCodecID video_type; unsigned int sample_count; film_sample *sample_table; unsigned int current_sample; @@ -101,7 +101,7 @@ static int film_read_header(AVFormatContext *s) if (avio_read(pb, scratch, 20) != 20) return AVERROR(EIO); /* make some assumptions about the audio parameters */ - film->audio_type = CODEC_ID_PCM_S8; + film->audio_type = AV_CODEC_ID_PCM_S8; film->audio_samplerate = 22050; film->audio_channels = 1; film->audio_bits = 8; @@ -113,27 +113,27 @@ static int film_read_header(AVFormatContext *s) film->audio_channels = scratch[21]; film->audio_bits = scratch[22]; if (scratch[23] == 2) - film->audio_type = CODEC_ID_ADPCM_ADX; + film->audio_type = AV_CODEC_ID_ADPCM_ADX; else if (film->audio_channels > 0) { if (film->audio_bits == 8) - film->audio_type = CODEC_ID_PCM_S8; + film->audio_type = AV_CODEC_ID_PCM_S8; else if (film->audio_bits == 16) - film->audio_type = CODEC_ID_PCM_S16BE; + film->audio_type = AV_CODEC_ID_PCM_S16BE; else - film->audio_type = CODEC_ID_NONE; + film->audio_type = AV_CODEC_ID_NONE; } else - film->audio_type = CODEC_ID_NONE; + film->audio_type = AV_CODEC_ID_NONE; } if (AV_RB32(&scratch[0]) != FDSC_TAG) return AVERROR_INVALIDDATA; if (AV_RB32(&scratch[8]) == CVID_TAG) { - film->video_type = CODEC_ID_CINEPAK; + film->video_type = AV_CODEC_ID_CINEPAK; } else if (AV_RB32(&scratch[8]) == RAW_TAG) { - film->video_type = CODEC_ID_RAWVIDEO; + film->video_type = AV_CODEC_ID_RAWVIDEO; } else { - film->video_type = CODEC_ID_NONE; + film->video_type = AV_CODEC_ID_NONE; } /* initialize the decoder streams */ @@ -148,7 +148,7 @@ static int film_read_header(AVFormatContext *s) st->codec->width = AV_RB32(&scratch[16]); st->codec->height = AV_RB32(&scratch[12]); - if (film->video_type == CODEC_ID_RAWVIDEO) { + if (film->video_type == AV_CODEC_ID_RAWVIDEO) { if (scratch[20] == 24) { st->codec->pix_fmt = PIX_FMT_RGB24; } else { @@ -169,7 +169,7 @@ static int film_read_header(AVFormatContext *s) st->codec->channels = film->audio_channels; st->codec->sample_rate = film->audio_samplerate; - if (film->audio_type == CODEC_ID_ADPCM_ADX) { + if (film->audio_type == AV_CODEC_ID_ADPCM_ADX) { st->codec->bits_per_coded_sample = 18 * 8 / 32; st->codec->block_align = st->codec->channels * 18; st->need_parsing = AVSTREAM_PARSE_FULL; @@ -218,10 +218,10 @@ static int film_read_header(AVFormatContext *s) film->sample_table[i].stream = film->audio_stream_index; film->sample_table[i].pts = audio_frame_counter; - if (film->audio_type == CODEC_ID_ADPCM_ADX) + if (film->audio_type == AV_CODEC_ID_ADPCM_ADX) audio_frame_counter += (film->sample_table[i].sample_size * 32 / (18 * film->audio_channels)); - else if (film->audio_type != CODEC_ID_NONE) + else if (film->audio_type != AV_CODEC_ID_NONE) audio_frame_counter += (film->sample_table[i].sample_size / (film->audio_channels * film->audio_bits / 8)); } else { @@ -256,14 +256,14 @@ static int film_read_packet(AVFormatContext *s, /* do a special song and dance when loading FILM Cinepak chunks */ if ((sample->stream == film->video_stream_index) && - (film->video_type == CODEC_ID_CINEPAK)) { + (film->video_type == AV_CODEC_ID_CINEPAK)) { pkt->pos= avio_tell(pb); if (av_new_packet(pkt, sample->sample_size)) return AVERROR(ENOMEM); avio_read(pb, pkt->data, sample->sample_size); } else if ((sample->stream == film->audio_stream_index) && (film->audio_channels == 2) && - (film->audio_type != CODEC_ID_ADPCM_ADX)) { + (film->audio_type != AV_CODEC_ID_ADPCM_ADX)) { /* stereo PCM needs to be interleaved */ if (av_new_packet(pkt, sample->sample_size)) |