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/bit.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/bit.c')
| -rw-r--r-- | libavformat/bit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/bit.c b/libavformat/bit.c index 138d2feadb..c3f2fdfbe3 100644 --- a/libavformat/bit.c +++ b/libavformat/bit.c @@ -55,11 +55,11 @@ 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_G729; - st->codec->sample_rate=8000; - st->codec->block_align = 16; - st->codec->channels=1; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id=AV_CODEC_ID_G729; + st->codecpar->sample_rate=8000; + st->codecpar->block_align = 16; + st->codecpar->channels=1; avpriv_set_pts_info(st, 64, 1, 100); return 0; @@ -117,16 +117,16 @@ AVInputFormat ff_bit_demuxer = { #if CONFIG_MUXERS static int write_header(AVFormatContext *s) { - AVCodecContext *enc = s->streams[0]->codec; + AVCodecParameters *par = s->streams[0]->codecpar; - if ((enc->codec_id != AV_CODEC_ID_G729) || enc->channels != 1) { + if ((par->codec_id != AV_CODEC_ID_G729) || par->channels != 1) { av_log(s, AV_LOG_ERROR, "only codec g729 with 1 channel is supported by this format\n"); return AVERROR(EINVAL); } - enc->bits_per_coded_sample = 16; - enc->block_align = (enc->bits_per_coded_sample * enc->channels) >> 3; + par->bits_per_coded_sample = 16; + par->block_align = (par->bits_per_coded_sample * par->channels) >> 3; return 0; } |