From 972586344a02ad65360bd967b7b7bfd20e0456e4 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 29 Mar 2017 14:04:01 +0200 Subject: [PATCH] vima: convert to new channel layout API Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/vima.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vima.c b/libavcodec/vima.c index c9a81e4401..5053feda90 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -147,9 +147,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, channel_hint[0] = ~channel_hint[0]; channels = 2; } - avctx->channels = channels; - avctx->channel_layout = (channels == 2) ? AV_CH_LAYOUT_STEREO - : AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + av_channel_layout_default(&avctx->ch_layout, channels); pcm_data[0] = get_sbits(&gb, 16); if (channels > 1) { channel_hint[1] = get_sbits(&gb, 8);