From: Anton Khirnov <an...@khirnov.net>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/avr.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavformat/avr.c b/libavformat/avr.c
index 6fdcf68952..14a633ea5d 100644
--- a/libavformat/avr.c
+++ b/libavformat/avr.c
@@ -52,10 +52,11 @@ static int avr_read_header(AVFormatContext *s)
avio_skip(s->pb, 8); // sample_name
chan = avio_rb16(s->pb);
+ st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
if (!chan) {
- st->codecpar->channels = 1;
+ st->codecpar->ch_layout.nb_channels = 1;
} else if (chan == 0xFFFFu) {
- st->codecpar->channels = 2;
+ st->codecpar->ch_layout.nb_channels = 2;
} else {
avpriv_request_sample(s, "chan %d", chan);
return AVERROR_PATCHWELCOME;
@@ -81,7 +82,7 @@ static int avr_read_header(AVFormatContext *s)
return AVERROR_PATCHWELCOME;
}
- st->codecpar->block_align = bps * st->codecpar->channels / 8;
+ st->codecpar->block_align = bps * st->codecpar->ch_layout.nb_channels / 8;
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
return 0;
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
