From 8f74c313f19057575f376c2be4aad1c2c53d7df8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 19 May 2024 00:54:59 +0200 Subject: [PATCH] avcodec/vvc/ctu: Simplify code at the end of pred_mode_decode() This simplification assumes that the code is correct Fixes: CID1560036 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/vvc/ctu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index 8dd6ea77cd..3f9a75190b 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1080,12 +1080,10 @@ static PredMode pred_mode_decode(VVCLocalContext *lc, } if (pred_mode_ibc_flag) pred_mode = MODE_IBC; + return pred_mode; } else { - pred_mode_flag = is_4x4 || mode_type == MODE_TYPE_INTRA || - mode_type != MODE_TYPE_INTER || IS_I(rsh); - pred_mode = pred_mode_flag ? MODE_INTRA : MODE_INTER; + return MODE_INTRA; } - return pred_mode; } static void sbt_info(VVCLocalContext *lc, const VVCSPS *sps)