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/acm.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/acm.c')
| -rw-r--r-- | libavformat/acm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/acm.c b/libavformat/acm.c index afcafa8d7a..08dd9282fa 100644 --- a/libavformat/acm.c +++ b/libavformat/acm.c @@ -41,24 +41,24 @@ static int acm_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = AV_CODEC_ID_INTERPLAY_ACM; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_INTERPLAY_ACM; - ff_alloc_extradata(st->codec, 14); - if (!st->codec->extradata) + ff_alloc_extradata(st->codecpar, 14); + if (!st->codecpar->extradata) return AVERROR(ENOMEM); - ret = avio_read(s->pb, st->codec->extradata, 14); + ret = avio_read(s->pb, st->codecpar->extradata, 14); if (ret < 10) return ret < 0 ? ret : AVERROR_EOF; - st->codec->channels = AV_RL16(st->codec->extradata + 8); - st->codec->sample_rate = AV_RL16(st->codec->extradata + 10); - if (st->codec->channels <= 0 || st->codec->sample_rate <= 0) + st->codecpar->channels = AV_RL16(st->codecpar->extradata + 8); + st->codecpar->sample_rate = AV_RL16(st->codecpar->extradata + 10); + if (st->codecpar->channels <= 0 || st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; st->start_time = 0; - st->duration = AV_RL32(st->codec->extradata + 4) / st->codec->channels; + st->duration = AV_RL32(st->codecpar->extradata + 4) / st->codecpar->channels; st->need_parsing = AVSTREAM_PARSE_FULL_RAW; - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0; } |