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/boadec.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/boadec.c')
| -rw-r--r-- | libavformat/boadec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/boadec.c b/libavformat/boadec.c index be003e59c1..ac2a33b3f0 100644 --- a/libavformat/boadec.c +++ b/libavformat/boadec.c @@ -46,16 +46,16 @@ static int read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = AV_CODEC_ID_ADPCM_MS; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_ADPCM_MS; avio_rl32(s->pb); avio_rl32(s->pb); - st->codec->sample_rate = avio_rl32(s->pb); - st->codec->channels = avio_rl32(s->pb); + st->codecpar->sample_rate = avio_rl32(s->pb); + st->codecpar->channels = avio_rl32(s->pb); s->internal->data_offset = avio_rl32(s->pb); avio_r8(s->pb); - st->codec->block_align = st->codec->channels * avio_rl32(s->pb); + st->codecpar->block_align = st->codecpar->channels * avio_rl32(s->pb); avio_seek(s->pb, s->internal->data_offset, SEEK_SET); @@ -66,7 +66,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) { AVStream *st = s->streams[0]; - return av_get_packet(s->pb, pkt, st->codec->block_align); + return av_get_packet(s->pb, pkt, st->codecpar->block_align); } AVInputFormat ff_boa_demuxer = { |