From f696343d13b149b25dba0b76d329560da208e905 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 13 May 2019 11:11:26 +0200 Subject: [PATCH] acm: convert to new channel layout API Signed-off-by: James Almer --- libavformat/acm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/acm.c b/libavformat/acm.c index 0ee9114f70..c88152d525 100644 --- a/libavformat/acm.c +++ b/libavformat/acm.c @@ -48,12 +48,12 @@ static int acm_read_header(AVFormatContext *s) if (ret < 0) return ret; - st->codecpar->channels = AV_RL16(st->codecpar->extradata + 8); + st->codecpar->ch_layout.nb_channels = AV_RL16(st->codecpar->extradata + 8); st->codecpar->sample_rate = AV_RL16(st->codecpar->extradata + 10); - if (st->codecpar->channels <= 0 || st->codecpar->sample_rate <= 0) + if (st->codecpar->ch_layout.nb_channels <= 0 || st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; st->start_time = 0; - st->duration = AV_RL32(st->codecpar->extradata + 4) / st->codecpar->channels; + st->duration = AV_RL32(st->codecpar->extradata + 4) / st->codecpar->ch_layout.nb_channels; ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);