From: Anton Khirnov <an...@khirnov.net>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/mpc7.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index c1a63203d6..c3ca9cfe31 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -79,8 +79,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
LOCAL_ALIGNED_16(uint8_t, buf, [16]);
/* Musepack SV7 is always stereo */
- if (avctx->channels != 2) {
- avpriv_request_sample(avctx, "%d channels", avctx->channels);
+ if (avctx->ch_layout.nb_channels != 2) {
+ avpriv_request_sample(avctx, "%d channels",
avctx->ch_layout.nb_channels);
return AVERROR_PATCHWELCOME;
}
@@ -110,7 +110,8 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
c->frames_to_skip = 0;
avctx->sample_fmt = AV_SAMPLE_FMT_S16P;
- avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+ av_channel_layout_uninit(&avctx->ch_layout);
+ avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO;
ff_thread_once(&init_static_once, mpc7_init_static);
--
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".
