From 859d9d70f9faf87bfc3fe23f97c38fd661367778 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 18 Sep 2022 21:27:15 +0200 Subject: [PATCH] avcodec/encode: Remove dead deprecated check The wrapper for the legacy channel layout API already sets AVCodecContext.channels based upon AVCodecContext.channel_layout if the latter is set while the former is unset. Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 049b71c6f4..ffac2c1ff3 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -631,8 +631,6 @@ FF_DISABLE_DEPRECATION_WARNINGS buf, channels, avctx->channels); return AVERROR(EINVAL); } - } else if (avctx->channel_layout) { - avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout); } if (avctx->channels < 0) { av_log(avctx, AV_LOG_ERROR, "Specified number of channels %d is not supported\n",