virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

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

Browse Source 
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@gmail.com>
This commit is contained in:
James Almer
2022-07-29 18:05:51 -03:00
parent 6406d5e430
commit 6ca1690643
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/alac.c
View File

@@ -574,13 +574,15 @@ static av_cold int alac_decode_init(AVCodecContext * avctx)
avctx->bits_per_raw_sample = alac->sample_size; avctx->bits_per_raw_sample = alac->sample_size;
avctx->sample_rate = alac->sample_rate; 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"); 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; 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", avpriv_report_missing_feature(avctx, "Channel count %d",
avctx->ch_layout.nb_channels); alac->channels);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
av_channel_layout_uninit(&avctx->ch_layout); av_channel_layout_uninit(&avctx->ch_layout);