From: Anton Khirnov <an...@khirnov.net>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/vag.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavformat/vag.c b/libavformat/vag.c
index 9ef5466e39..624ae9df35 100644
--- a/libavformat/vag.c
+++ b/libavformat/vag.c
@@ -42,9 +42,10 @@ static int vag_read_header(AVFormatContext *s)
avio_skip(s->pb, 4);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX;
- st->codecpar->channels = 1 + (avio_rb32(s->pb) == 0x00000004);
+ st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+ st->codecpar->ch_layout.nb_channels = 1 + (avio_rb32(s->pb) == 0x00000004);
avio_skip(s->pb, 4);
- if (st->codecpar->channels > 1) {
+ if (st->codecpar->ch_layout.nb_channels > 1) {
st->duration = avio_rb32(s->pb);
} else {
st->duration = avio_rb32(s->pb) / 16 * 28;
@@ -54,12 +55,12 @@ static int vag_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
avio_seek(s->pb, 0x1000, SEEK_SET);
if (avio_rl32(s->pb) == MKTAG('V','A','G','p')) {
- st->codecpar->block_align = 0x1000 * st->codecpar->channels;
+ st->codecpar->block_align = 0x1000 *
st->codecpar->ch_layout.nb_channels;
avio_seek(s->pb, 0, SEEK_SET);
st->duration = st->duration / 16 * 28;
} else {
- st->codecpar->block_align = 16 * st->codecpar->channels;
- avio_seek(s->pb, st->codecpar->channels > 1 ? 0x80 : 0x30, SEEK_SET);
+ st->codecpar->block_align = 16 * st->codecpar->ch_layout.nb_channels;
+ avio_seek(s->pb, st->codecpar->ch_layout.nb_channels > 1 ? 0x80 :
0x30, SEEK_SET);
}
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
--
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".
