diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:58:15 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-10 20:59:55 +0100 |
| commit | 6f69f7a8bf6a0d013985578df2ef42ee6b1c7994 (patch) | |
| tree | 0c2ec8349ff1763d5f48454b8b9f26374dbd80b0 /libavformat/xvag.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
| download | ffmpeg-6f69f7a8bf6a0d013985578df2ef42ee6b1c7994.tar.gz | |
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/xvag.c')
| -rw-r--r-- | libavformat/xvag.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/xvag.c b/libavformat/xvag.c index 92c80a48e8..5ef4fb0900 100644 --- a/libavformat/xvag.c +++ b/libavformat/xvag.c @@ -43,7 +43,7 @@ static int xvag_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; offset = avio_rl32(s->pb); big_endian = offset > av_bswap32(offset); @@ -51,30 +51,30 @@ static int xvag_read_header(AVFormatContext *s) offset = av_bswap32(offset); avio_skip(s->pb, 28); codec = avio_rb32(s->pb); - st->codec->channels = avio_rb32(s->pb); + st->codecpar->channels = avio_rb32(s->pb); avio_skip(s->pb, 4); st->duration = avio_rb32(s->pb); avio_skip(s->pb, 8); - st->codec->sample_rate = avio_rb32(s->pb); + st->codecpar->sample_rate = avio_rb32(s->pb); } else { avio_skip(s->pb, 28); codec = avio_rl32(s->pb); - st->codec->channels = avio_rl32(s->pb); + st->codecpar->channels = avio_rl32(s->pb); avio_skip(s->pb, 4); st->duration = avio_rl32(s->pb); avio_skip(s->pb, 8); - st->codec->sample_rate = avio_rl32(s->pb); + st->codecpar->sample_rate = avio_rl32(s->pb); } - if (st->codec->sample_rate <= 0) + if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; - if (st->codec->channels <= 0) + if (st->codecpar->channels <= 0) return AVERROR_INVALIDDATA; switch (codec) { case 0x1c: - st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codec->block_align = 16 * st->codec->channels; + st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codecpar->block_align = 16 * st->codecpar->channels; break; default: avpriv_request_sample(s, "codec %X", codec); @@ -84,22 +84,22 @@ static int xvag_read_header(AVFormatContext *s) avio_skip(s->pb, offset - avio_tell(s->pb)); if (avio_rb16(s->pb) == 0xFFFB) { - st->codec->codec_id = AV_CODEC_ID_MP3; - st->codec->block_align = 0x1000; + st->codecpar->codec_id = AV_CODEC_ID_MP3; + st->codecpar->block_align = 0x1000; st->need_parsing = AVSTREAM_PARSE_FULL_RAW; } avio_skip(s->pb, -2); - 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 xvag_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_xvag_demuxer = { |