diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-09-16 02:27:25 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-09-22 01:03:20 +0200 |
| commit | a06a2d89434abd8feb760a943924f3cfacedfda6 (patch) | |
| tree | 0c103802c5597f20656fb35f89dcdeec3386e410 /libavcodec/decode.c | |
| parent | 859d9d70f9faf87bfc3fe23f97c38fd661367778 (diff) | |
| download | ffmpeg-a06a2d89434abd8feb760a943924f3cfacedfda6.tar.gz | |
avcodec/avcodec: Check for more invalid channel layouts
In particular, check the provided channel layout for encoders
without AVCodec.ch_layouts set. This fixes an infinite loop
in the WavPack encoder (and maybe other issues in other encoders
as well) in case the channel count is zero.
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/decode.c')
| -rw-r--r-- | libavcodec/decode.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 2961705c9d..6be2d3d6ed 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1595,11 +1595,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif - if (avctx->codec_type == AVMEDIA_TYPE_AUDIO && avctx->ch_layout.nb_channels == 0 && - !(avctx->codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF)) { - av_log(avctx, AV_LOG_ERROR, "Decoder requires channel count but channels not set\n"); - return AVERROR(EINVAL); - } if (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) { av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n", avctx->codec->max_lowres); |