aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2017-03-31 13:22:18 +0200
committerJames Almer <jamrial@gmail.com>2022-03-15 09:42:29 -0300
commitc465791d3b9b7cf67be440ee06daf2eeb9f1c9fa (patch)
tree40697fd501d4bfa2a7ea547a563bf2fb07e6f438
parentb49e80a6498431b11fc14f5b00bd36c23351e92b (diff)
downloadffmpeg-c465791d3b9b7cf67be440ee06daf2eeb9f1c9fa.tar.gz
4xm: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/4xm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index e307560014..fdf6e4b84b 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -190,13 +190,13 @@ static int parse_strk(AVFormatContext *s,
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_tag = 0;
- st->codecpar->channels = fourxm->tracks[track].channels;
+ st->codecpar->ch_layout.nb_channels = fourxm->tracks[track].channels;
st->codecpar->sample_rate = fourxm->tracks[track].sample_rate;
st->codecpar->bits_per_coded_sample = fourxm->tracks[track].bits;
- st->codecpar->bit_rate = (int64_t)st->codecpar->channels *
+ st->codecpar->bit_rate = (int64_t)st->codecpar->ch_layout.nb_channels *
st->codecpar->sample_rate *
st->codecpar->bits_per_coded_sample;
- st->codecpar->block_align = st->codecpar->channels *
+ st->codecpar->block_align = st->codecpar->ch_layout.nb_channels *
st->codecpar->bits_per_coded_sample;
if (fourxm->tracks[track].adpcm){