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/aadec.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/aadec.c')
| -rw-r--r-- | libavformat/aadec.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 266a8e85ac..cf5f3d107a 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -173,22 +173,22 @@ static int aa_read_header(AVFormatContext *s) av_freep(&c->tea_ctx); return AVERROR(ENOMEM); } - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; if (!strcmp(codec_name, "mp332")) { - st->codec->codec_id = AV_CODEC_ID_MP3; - st->codec->sample_rate = 22050; + st->codecpar->codec_id = AV_CODEC_ID_MP3; + st->codecpar->sample_rate = 22050; st->need_parsing = AVSTREAM_PARSE_FULL_RAW; st->start_time = 0; } else if (!strcmp(codec_name, "acelp85")) { - st->codec->codec_id = AV_CODEC_ID_SIPR; - st->codec->block_align = 19; - st->codec->channels = 1; - st->codec->sample_rate = 8500; + st->codecpar->codec_id = AV_CODEC_ID_SIPR; + st->codecpar->block_align = 19; + st->codecpar->channels = 1; + st->codecpar->sample_rate = 8500; } else if (!strcmp(codec_name, "acelp16")) { - st->codec->codec_id = AV_CODEC_ID_SIPR; - st->codec->block_align = 20; - st->codec->channels = 1; - st->codec->sample_rate = 16000; + st->codecpar->codec_id = AV_CODEC_ID_SIPR; + st->codecpar->block_align = 20; + st->codecpar->channels = 1; + st->codecpar->sample_rate = 16000; } /* determine, and jump to audio start offset */ |