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/ircamenc.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/ircamenc.c')
| -rw-r--r-- | libavformat/ircamenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/ircamenc.c b/libavformat/ircamenc.c index 1a829d4c08..323ecb37ee 100644 --- a/libavformat/ircamenc.c +++ b/libavformat/ircamenc.c @@ -28,7 +28,7 @@ static int ircam_write_header(AVFormatContext *s) { - AVCodecContext *codec = s->streams[0]->codec; + AVCodecParameters *par = s->streams[0]->codecpar; uint32_t tag; if (s->nb_streams != 1) { @@ -36,15 +36,15 @@ static int ircam_write_header(AVFormatContext *s) return AVERROR(EINVAL); } - tag = ff_codec_get_tag(ff_codec_ircam_le_tags, codec->codec_id); + tag = ff_codec_get_tag(ff_codec_ircam_le_tags, par->codec_id); if (!tag) { av_log(s, AV_LOG_ERROR, "unsupported codec\n"); return AVERROR(EINVAL); } avio_wl32(s->pb, 0x0001A364); - avio_wl32(s->pb, av_q2intfloat((AVRational){codec->sample_rate, 1})); - avio_wl32(s->pb, codec->channels); + avio_wl32(s->pb, av_q2intfloat((AVRational){par->sample_rate, 1})); + avio_wl32(s->pb, par->channels); avio_wl32(s->pb, tag); ffio_fill(s->pb, 0, 1008); return 0; |