From: Anton Khirnov <an...@khirnov.net>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: Anton Khirnov <an...@khirnov.net>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/mpc8.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index ae07093338..a0466ec135 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -169,8 +169,8 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx)
c->frames = 1 << (get_bits(&gb, 3) * 2);
avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
- avctx->channel_layout = (channels==2) ? AV_CH_LAYOUT_STEREO :
AV_CH_LAYOUT_MONO;
- avctx->channels = channels;
+ av_channel_layout_uninit(&avctx->ch_layout);
+ av_channel_layout_default(&avctx->ch_layout, channels);
ff_thread_once(&init_static_once, mpc8_init_static);
@@ -358,7 +358,7 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void
*data,
ff_mpc_dequantize_and_synth(c, maxband - 1,
(int16_t **)frame->extended_data,
- avctx->channels);
+ avctx->ch_layout.nb_channels);
c->cur_frame++;
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
