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

James Almer jamrial at gmail.com
Thu Jan 13 03:50:12 EET 2022


From: Vittorio Giovara <vittorio.giovara at gmail.com>

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

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;
 }
-- 
2.34.1



More information about the ffmpeg-devel mailing list