Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/acedec.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavformat/acedec.c b/libavformat/acedec.c
index a52a0f0e54..74128e0a6a 100644
--- a/libavformat/acedec.c
+++ b/libavformat/acedec.c
@@ -74,7 +74,8 @@ static int ace_read_header(AVFormatContext *s)
st->start_time = 0;
par = st->codecpar;
par->codec_type = AVMEDIA_TYPE_AUDIO;
- par->channels = nb_channels;
+ par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+ par->ch_layout.nb_channels = nb_channels;
par->sample_rate = rate;
par->block_align = (codec == 4 ? 0x60 : codec == 5 ? 0x98 : 0xC0) *
nb_channels;
st->duration = (size / par->block_align) * 1024LL;
@@ -85,7 +86,7 @@ static int ace_read_header(AVFormatContext *s)
return ret;
AV_WL16(st->codecpar->extradata, 1);
- AV_WL16(st->codecpar->extradata+2, 2048 * par->channels);
+ AV_WL16(st->codecpar->extradata+2, 2048 * nb_channels);
AV_WL16(st->codecpar->extradata+4, 0);
AV_WL16(st->codecpar->extradata+6, codec == 4 ? 1 : 0);
AV_WL16(st->codecpar->extradata+8, codec == 4 ? 1 : 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".
