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/dcstr.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/dcstr.c')
| -rw-r--r-- | libavformat/dcstr.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/dcstr.c b/libavformat/dcstr.c index 2ae61dec85..69fae417e8 100644 --- a/libavformat/dcstr.c +++ b/libavformat/dcstr.c @@ -39,35 +39,35 @@ static int dcstr_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->channels = avio_rl32(s->pb); - st->codec->sample_rate = avio_rl32(s->pb); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->channels = avio_rl32(s->pb); + st->codecpar->sample_rate = avio_rl32(s->pb); codec = avio_rl32(s->pb); align = avio_rl32(s->pb); avio_skip(s->pb, 4); st->duration = avio_rl32(s->pb); - st->codec->channels *= avio_rl32(s->pb); - if (!align || align > INT_MAX / st->codec->channels) + st->codecpar->channels *= avio_rl32(s->pb); + if (!align || align > INT_MAX / st->codecpar->channels) return AVERROR_INVALIDDATA; - st->codec->block_align = align * st->codec->channels; + st->codecpar->block_align = align * st->codecpar->channels; switch (codec) { - case 4: st->codec->codec_id = AV_CODEC_ID_ADPCM_AICA; break; - case 16: st->codec->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR; break; + case 4: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_AICA; break; + case 16: st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR; break; default: avpriv_request_sample(s, "codec %X", codec); return AVERROR_PATCHWELCOME; } avio_skip(s->pb, 0x800 - avio_tell(s->pb)); - 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 dcstr_read_packet(AVFormatContext *s, AVPacket *pkt) { - AVCodecContext *codec = s->streams[0]->codec; - return av_get_packet(s->pb, pkt, codec->block_align); + AVCodecParameters *par = s->streams[0]->codecpar; + return av_get_packet(s->pb, pkt, par->block_align); } AVInputFormat ff_dcstr_demuxer = { |