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/ads.c | |
| parent | 60b75186b2c878b6257b43c8fcc0b1356ada218e (diff) | |
| parent | 9200514ad8717c63f82101dc394f4378854325bf (diff) | |
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/ads.c')
| -rw-r--r-- | libavformat/ads.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/ads.c b/libavformat/ads.c index bda2673bad..73ea7c7d54 100644 --- a/libavformat/ads.c +++ b/libavformat/ads.c @@ -42,39 +42,39 @@ static int ads_read_header(AVFormatContext *s) return AVERROR(ENOMEM); avio_skip(s->pb, 8); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; codec = avio_rl32(s->pb); - st->codec->sample_rate = avio_rl32(s->pb); - if (st->codec->sample_rate <= 0) + st->codecpar->sample_rate = avio_rl32(s->pb); + if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; - st->codec->channels = avio_rl32(s->pb); - if (st->codec->channels <= 0) + st->codecpar->channels = avio_rl32(s->pb); + if (st->codecpar->channels <= 0) return AVERROR_INVALIDDATA; align = avio_rl32(s->pb); - if (align <= 0 || align > INT_MAX / st->codec->channels) + if (align <= 0 || align > INT_MAX / st->codecpar->channels) return AVERROR_INVALIDDATA; if (codec == 1) - st->codec->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR; + st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE_PLANAR; else - st->codec->codec_id = AV_CODEC_ID_ADPCM_PSX; + st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codec->block_align = st->codec->channels * align; + st->codecpar->block_align = st->codecpar->channels * align; avio_skip(s->pb, 12); size = avio_rl32(s->pb); - if (st->codec->codec_id == AV_CODEC_ID_ADPCM_PSX) - st->duration = (size - 0x40) / 16 / st->codec->channels * 28; - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_PSX) + st->duration = (size - 0x40) / 16 / st->codecpar->channels * 28; + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0; } static int ads_read_packet(AVFormatContext *s, AVPacket *pkt) { - AVCodecContext *codec = s->streams[0]->codec; + AVCodecParameters *par = s->streams[0]->codecpar; int ret; - ret = av_get_packet(s->pb, pkt, codec->block_align); + ret = av_get_packet(s->pb, pkt, par->block_align); pkt->stream_index = 0; return ret; } |