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/ircamdec.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/ircamdec.c')
| -rw-r--r-- | libavformat/ircamdec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/ircamdec.c b/libavformat/ircamdec.c index f9533ec4a5..59f3a49411 100644 --- a/libavformat/ircamdec.c +++ b/libavformat/ircamdec.c @@ -85,19 +85,19 @@ static int ircam_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->channels = channels; - st->codec->sample_rate = sample_rate; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->channels = channels; + st->codecpar->sample_rate = sample_rate; - st->codec->codec_id = ff_codec_get_id(tags, tag); - if (st->codec->codec_id == AV_CODEC_ID_NONE) { + st->codecpar->codec_id = ff_codec_get_id(tags, tag); + if (st->codecpar->codec_id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "unknown tag %X\n", tag); return AVERROR_INVALIDDATA; } - st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id); - st->codec->block_align = st->codec->bits_per_coded_sample * st->codec->channels / 8; - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id); + st->codecpar->block_align = st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8; + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_skip(s->pb, 1008); return 0; |