---
libavformat/ads.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavformat/ads.c b/libavformat/ads.c
index f25141b3c6..20be40f499 100644
--- a/libavformat/ads.c
+++ b/libavformat/ads.c
@@ -47,11 +47,12 @@ static int ads_read_header(AVFormatContext *s)
st->codecpar->sample_rate = avio_rl32(s->pb);
if (st->codecpar->sample_rate <= 0)
return AVERROR_INVALIDDATA;
- st->codecpar->channels = avio_rl32(s->pb);
- if (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 <= 0)
return AVERROR_INVALIDDATA;
align = avio_rl32(s->pb);
- if (align <= 0 || align > INT_MAX / st->codecpar->channels)
+ if (align <= 0 || align > INT_MAX / st->codecpar->ch_layout.nb_channels)
return AVERROR_INVALIDDATA;
if (codec == 1)
@@ -59,11 +60,11 @@ static int ads_read_header(AVFormatContext *s)
else
st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX;
- st->codecpar->block_align = st->codecpar->channels * align;
+ st->codecpar->block_align = st->codecpar->ch_layout.nb_channels * align;
avio_skip(s->pb, 12);
size = avio_rl32(s->pb);
if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_PSX)
- st->duration = (size - 0x40) / 16 / st->codecpar->channels * 28;
+ st->duration = (size - 0x40) / 16 /
st->codecpar->ch_layout.nb_channels * 28;
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
return 0;
--
2.24.0
_______________________________________________
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".
