From bf2f9e5985ffce952d1e3d8adf45e48a9cdc9c59 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 30 Apr 2025 02:12:53 +0200 Subject: [PATCH 31/44] avcodec/mpegvideo: Remove dead checks ff_mpv_common_init() is no longer called with 0x0 dimensions at all, so s->mb_height is never zero. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index c804205745..9c96e25e03 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -405,15 +405,10 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (ret < 0) goto fail; - if (nb_slices > MAX_THREADS || (nb_slices > s->mb_height && s->mb_height)) { - int max_slices; - if (s->mb_height) - max_slices = FFMIN(MAX_THREADS, s->mb_height); - else - max_slices = MAX_THREADS; + if (nb_slices > FFMIN(MAX_THREADS, s->mb_height)) { av_log(s->avctx, AV_LOG_WARNING, "too many threads/slices (%d)," - " reducing to %d\n", nb_slices, max_slices); - nb_slices = max_slices; + " reducing to %d\n", nb_slices, FFMIN(MAX_THREADS, s->mb_height)); + nb_slices = FFMIN(MAX_THREADS, s->mb_height); } s->context_initialized = 1; -- 2.45.2