diff options
| author | Anton Khirnov <anton@khirnov.net> | 2020-01-29 17:31:41 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:38 -0300 |
| commit | 15c6547829e65cc2dda2bfc15d33cf24d238a684 (patch) | |
| tree | ca9da05387da3b9803cdea566f98e6458cdf7d1e /libavformat | |
| parent | 4b585831711b9e43ef58ca9cbcc3784ee9fb2b33 (diff) | |
| download | ffmpeg-15c6547829e65cc2dda2bfc15d33cf24d238a684.tar.gz | |
vag: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/vag.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/vag.c b/libavformat/vag.c index 9ef5466e39..b3aa1c5b93 100644 --- a/libavformat/vag.c +++ b/libavformat/vag.c @@ -42,9 +42,9 @@ 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.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 +54,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); |