diff options
Diffstat (limited to 'libavformat/vag.c')
| -rw-r--r-- | libavformat/vag.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavformat/vag.c b/libavformat/vag.c index 2875db501e..e8ebcaffd6 100644 --- a/libavformat/vag.c +++ b/libavformat/vag.c @@ -40,37 +40,37 @@ static int vag_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avio_skip(s->pb, 4); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codec->channels = 1 + (avio_rb32(s->pb) == 0x00000004); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codecpar->channels = 1 + (avio_rb32(s->pb) == 0x00000004); avio_skip(s->pb, 4); - if (st->codec->channels > 1) { + if (st->codecpar->channels > 1) { st->duration = avio_rb32(s->pb); } else { st->duration = avio_rb32(s->pb) / 16 * 28; } - st->codec->sample_rate = avio_rb32(s->pb); - if (st->codec->sample_rate <= 0) + st->codecpar->sample_rate = avio_rb32(s->pb); + if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; avio_seek(s->pb, 0x1000, SEEK_SET); if (avio_rl32(s->pb) == MKTAG('V','A','G','p')) { - st->codec->block_align = 0x1000 * st->codec->channels; + st->codecpar->block_align = 0x1000 * st->codecpar->channels; avio_seek(s->pb, 0, SEEK_SET); st->duration = st->duration / 16 * 28; } else { - st->codec->block_align = 16 * st->codec->channels; - avio_seek(s->pb, st->codec->channels > 1 ? 0x80 : 0x30, SEEK_SET); + st->codecpar->block_align = 16 * st->codecpar->channels; + avio_seek(s->pb, st->codecpar->channels > 1 ? 0x80 : 0x30, SEEK_SET); } - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0; } static int vag_read_packet(AVFormatContext *s, AVPacket *pkt) { - AVCodecContext *codec = s->streams[0]->codec; + AVCodecParameters *par = s->streams[0]->codecpar; - return av_get_packet(s->pb, pkt, codec->block_align); + return av_get_packet(s->pb, pkt, par->block_align); } AVInputFormat ff_vag_demuxer = { |