From 77616c5fb4ee6e1223c1c4d30cc76412a9e7e9d0 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 16 Mar 2021 20:07:20 +0100 Subject: avcodec/avcodec: Move decoder channel count check to ff_decode_preinit Signed-off-by: Andreas Rheinhardt --- libavcodec/avcodec.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libavcodec/avcodec.c') diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index b3940b97e0..2f3896dcc4 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -270,14 +270,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret = AVERROR(EINVAL); goto free_and_end; } - if (av_codec_is_decoder(codec) && - codec->type == AVMEDIA_TYPE_AUDIO && - !(codec->capabilities & AV_CODEC_CAP_CHANNEL_CONF) && - avctx->channels == 0) { - av_log(avctx, AV_LOG_ERROR, "Decoder requires channel count but channels not set\n"); - ret = AVERROR(EINVAL); - goto free_and_end; - } if (avctx->sample_rate < 0) { av_log(avctx, AV_LOG_ERROR, "Invalid sample rate: %d\n", avctx->sample_rate); -- cgit v1.2.3