diff mbox series

[FFmpeg-devel,050/281] dsicin: convert to new channel layout API

Message ID 20220113015101.4-51-jamrial@gmail.com
State Accepted
Commit 279876c3548d5571246e27a463c6d1d62eda1a71
Headers show
Series New channel layout API | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished

Commit Message

James Almer Jan. 13, 2022, 1:50 a.m. UTC 
From: Vittorio Giovara <vittorio.giovara@gmail.com>

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/dsicin.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c
index 481f365a53..13ee9f87bb 100644
--- a/libavformat/dsicin.c
+++ b/libavformat/dsicin.c
@@ -132,11 +132,12 @@  static int cin_read_header(AVFormatContext *s)
     st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codecpar->codec_id = AV_CODEC_ID_DSICINAUDIO;
     st->codecpar->codec_tag = 0;  /* no tag */
-    st->codecpar->channels = 1;
-    st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
+    st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
     st->codecpar->sample_rate = 22050;
     st->codecpar->bits_per_coded_sample = 8;
-    st->codecpar->bit_rate = st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample * st->codecpar->channels;
+    st->codecpar->bit_rate = st->codecpar->sample_rate *
+                             st->codecpar->bits_per_coded_sample *
+                             st->codecpar->ch_layout.nb_channels;
 
     return 0;
 }