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/smacker.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 75ab5d7120..4a3999e4f1 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -572,11 +572,13 @@ static av_cold int decode_init(AVCodecContext *avctx)
static av_cold int smka_decode_init(AVCodecContext *avctx)
{
- if (avctx->channels < 1 || avctx->channels > 2) {
+ int channels = avctx->ch_layout.nb_channels;
+ if (channels < 1 || channels > 2) {
av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n");
return AVERROR_INVALIDDATA;
}
- avctx->channel_layout = (avctx->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);
avctx->sample_fmt = avctx->bits_per_coded_sample == 8 ? AV_SAMPLE_FMT_U8 :
AV_SAMPLE_FMT_S16;
return 0;
@@ -623,7 +625,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void
*data,
}
stereo = get_bits1(&gb);
bits = get_bits1(&gb);
- if (stereo ^ (avctx->channels != 1)) {
+ if (stereo ^ (avctx->ch_layout.nb_channels != 1)) {
av_log(avctx, AV_LOG_ERROR, "channels mismatch\n");
return AVERROR_INVALIDDATA;
}
@@ -633,8 +635,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void
*data,
}
/* get output buffer */
- frame->nb_samples = unp_size / (avctx->channels * (bits + 1));
- if (unp_size % (avctx->channels * (bits + 1))) {
+ frame->nb_samples = unp_size / (avctx->ch_layout.nb_channels * (bits + 1));
+ if (unp_size % (avctx->ch_layout.nb_channels * (bits + 1))) {
av_log(avctx, AV_LOG_ERROR,
"The buffer does not contain an integer number of samples\n");
return AVERROR_INVALIDDATA;
--
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".
