[FFmpeg-cvslog] avcodec/alac: don't fail if channels aren't set during init() when extradata is valid

[James Almer]

ffmpeg | branch: release/5.1 | James Almer <jamrial at gmail.com> | Fri Jul 29 18:05:51 2022 -0300| [915ef932a3cd4679fa58d6c514992d90e5fa6930] | committer: James Almer

avcodec/alac: don't fail if channels aren't set during init() when extradata is valid

The decoder is meant to use it as a fallback if the value in extradata is
invalid.

Regression since d199099be.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=915ef932a3cd4679fa58d6c514992d90e5fa6930
---

 libavcodec/alac.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 9aaf7066b2..4aab82d60b 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -574,13 +574,15 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
     avctx->bits_per_raw_sample = alac->sample_size;
     avctx->sample_rate         = alac->sample_rate;
 
-    if (alac->channels < 1 || alac->channels > ALAC_MAX_CHANNELS) {
+    if (alac->channels < 1) {
         av_log(avctx, AV_LOG_WARNING, "Invalid channel count\n");
+        if (avctx->ch_layout.nb_channels < 1)
+            return AVERROR(EINVAL);
         alac->channels = avctx->ch_layout.nb_channels;
     }
-    if (avctx->ch_layout.nb_channels > ALAC_MAX_CHANNELS || avctx->ch_layout.nb_channels <= 0 ) {
+    if (alac->channels > ALAC_MAX_CHANNELS) {
         avpriv_report_missing_feature(avctx, "Channel count %d",
-                                      avctx->ch_layout.nb_channels);
+                                      alac->channels);
         return AVERROR_PATCHWELCOME;
     }
     av_channel_layout_uninit(&avctx->ch_layout);