From: Anton Khirnov <an...@khirnov.net>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/boadec.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/boadec.c b/libavformat/boadec.c
index 536300a895..a5104bbed0 100644
--- a/libavformat/boadec.c
+++ b/libavformat/boadec.c
@@ -55,15 +55,17 @@ static int read_header(AVFormatContext *s)
avio_rl32(s->pb);
avio_rl32(s->pb);
st->codecpar->sample_rate = avio_rl32(s->pb);
- st->codecpar->channels = avio_rl32(s->pb);
- if (st->codecpar->channels > FF_SANE_NB_CHANNELS || st->codecpar->channels
<= 0)
+ st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+ st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb);
+ if (st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS ||
+ st->codecpar->ch_layout.order <= 0)
return AVERROR(ENOSYS);
ffformatcontext(s)->data_offset = data_offset = avio_rl32(s->pb);
avio_r8(s->pb);
st->codecpar->block_align = avio_rl32(s->pb);
if (st->codecpar->block_align > INT_MAX / FF_SANE_NB_CHANNELS ||
st->codecpar->block_align <= 0)
return AVERROR_INVALIDDATA;
- st->codecpar->block_align *= st->codecpar->channels;
+ st->codecpar->block_align *= st->codecpar->ch_layout.nb_channels;
avio_seek(s->pb, data_offset, SEEK_SET);
--
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".
