dsicin: convert to new channel layout API

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
8 years ago · 279876c354
parent 7e531b24de
commit 279876c354
1 changed files with 4 additions and 3 deletions
--- 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;
 }