summaryrefslogtreecommitdiff
path: root/libavformat/ircamdec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2019-05-13 11:11:26 +0200
committerJames Almer <jamrial@gmail.com>2022-03-15 09:42:33 -0300
commitef65e450d241b1a72b3b137fe50c920fa651b621 (patch)
treec9dfcc357a926f84b9b10402a4a549c759085704 /libavformat/ircamdec.c
parentc94220e96de28152ca4fb1df549efe0edb001204 (diff)
ircam: convert to new channel layout API
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/ircamdec.c')
-rw-r--r--libavformat/ircamdec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/ircamdec.c b/libavformat/ircamdec.c
index a05ca5c9c7..eb59c95e14 100644
--- a/libavformat/ircamdec.c
+++ b/libavformat/ircamdec.c
@@ -87,8 +87,8 @@ static int ircam_read_header(AVFormatContext *s)
return AVERROR(ENOMEM);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codecpar->channels = channels;
- if (st->codecpar->channels > FF_SANE_NB_CHANNELS)
+ st->codecpar->ch_layout.nb_channels = channels;
+ if (st->codecpar->ch_layout.nb_channels > FF_SANE_NB_CHANNELS)
return AVERROR(ENOSYS);
st->codecpar->sample_rate = sample_rate;
@@ -99,7 +99,8 @@ static int ircam_read_header(AVFormatContext *s)
}
st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id);
- st->codecpar->block_align = st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8;
+ st->codecpar->block_align = st->codecpar->bits_per_coded_sample *
+ st->codecpar->ch_layout.nb_channels / 8;
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
avio_skip(s->pb, 1008);