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/apedec.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 607304fe36..46a53bc52d 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -233,13 +233,14 @@ static av_cold int ape_decode_close(AVCodecContext *avctx)
static av_cold int ape_decode_init(AVCodecContext *avctx)
{
APEContext *s = avctx->priv_data;
+ int channels = avctx->ch_layout.nb_channels;
int i;
if (avctx->extradata_size != 6) {
av_log(avctx, AV_LOG_ERROR, "Incorrect extradata\n");
return AVERROR(EINVAL);
}
- if (avctx->channels > 2) {
+ if (channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Only mono and stereo is supported\n");
return AVERROR(EINVAL);
}
@@ -261,7 +262,7 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)
return AVERROR_PATCHWELCOME;
}
s->avctx = avctx;
- s->channels = avctx->channels;
+ s->channels = channels;
s->fileversion = AV_RL16(avctx->extradata);
s->compression_level = AV_RL16(avctx->extradata + 2);
s->flags = AV_RL16(avctx->extradata + 4);
@@ -313,7 +314,9 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)
ff_bswapdsp_init(&s->bdsp);
ff_llauddsp_init(&s->adsp);
- avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO :
AV_CH_LAYOUT_MONO;
+ av_channel_layout_uninit(&avctx->ch_layout);
+ avctx->ch_layout = (channels == 2) ?
(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO
+ :
(AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
return 0;
}
--
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".
