diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-31 17:58:46 +0200 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:35 -0300 |
commit | 5b51e6771c5419118dc02b325aafed37ce5cb709 (patch) | |
tree | e65e694bad4912bab7b9476bcb0ff67225c70df9 /libavformat/oggparsevorbis.c | |
parent | f81417a6d2e2a200658c668b8414547a99f3d002 (diff) |
ogg: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/oggparsevorbis.c')
-rw-r--r-- | libavformat/oggparsevorbis.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index e1ef510892..289900f7cf 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -336,11 +336,12 @@ static int vorbis_header(AVFormatContext *s, int idx) return AVERROR_INVALIDDATA; channels = bytestream_get_byte(&p); - if (st->codecpar->channels && channels != st->codecpar->channels) { + if (st->codecpar->ch_layout.nb_channels && + channels != st->codecpar->ch_layout.nb_channels) { av_log(s, AV_LOG_ERROR, "Channel change is not supported\n"); return AVERROR_PATCHWELCOME; } - st->codecpar->channels = channels; + st->codecpar->ch_layout.nb_channels = channels; srate = bytestream_get_le32(&p); p += 4; // skip maximum bitrate st->codecpar->bit_rate = bytestream_get_le32(&p); // nominal bitrate |