From patchwork Thu Nov 12 18:22:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23604 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 42F65448413 for ; Thu, 12 Nov 2020 20:23:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2145868C1B5; Thu, 12 Nov 2020 20:23:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43C7368BB83 for ; Thu, 12 Nov 2020 20:23:38 +0200 (EET) Received: by mail-qt1-f196.google.com with SMTP id m65so4658894qte.11 for ; Thu, 12 Nov 2020 10:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+dpu5CZKaW9XZMzGcYrSg1w3i6BptoTTncYsWFKmP9A=; b=SsDeFX5ZOelaML83hqiTNEcfjHy+5Xrc5v6QP1+6okOBy8FL30qw9aHCsuNoWImXxU PgvAGqEvJzmw0k6W2CxtYupUqGB1fdZ9Fgwjh51p8fCbj93dkg6TvHclw8cvbEbZgbzi Kg7s6ZOcbnxogkyHYW8qneVTGRm6dNRy3QE6PCBgKEbR0vWD9lD5KD2AmNiK3ExlQOrR z51pKZY/AkpkU3R+18vNDT1Xm/PqZdY8OYVX4/vjJUvGpc8FWKBZzOY31zhpO/GXAi/g EOwovPTRRWW/5tdv6YHg3QeaXH8OFFAT3Hism3Qhwx2WGleXkD+QS7XD5MjOGsMHdtj5 dDsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=+dpu5CZKaW9XZMzGcYrSg1w3i6BptoTTncYsWFKmP9A=; b=TwKEttbzqcXWR/qrOZGjqPmJEtVyA6vmZBG4hgDo2KKStuhUooeJ+GC0hPDHDyezlL RcuEv9QvONSS1S/yMEaL7HOg9grLWHjbr2J5M6rbR43KwtzyBOZUTRGcFCQIl2tUJgO+ 9CZCWOzvYz0FWHKt9k0nXschyBOAp9G8+byFD0wa/ibfcM0PSs0FLe0b46R5EB+XCuZG qb9TShTVSt14L7T65Lacx9wBLS8KbXz5DrSrbweeKfE7WCvTk/2UXoUmLZm1/KFlLPaJ YeoBgWQjukwgajGjP0PPqT9IwtwrojXQm7YZS7PY3mZKl3+lPKTXVmBUfuztYH0pSI38 1kUQ== X-Gm-Message-State: AOAM531pDKZ61uh106sYRnkG55sb/S9Phn56d49t8McqlvCCO7bwUGm5 NnalQ6dtBXPVw2939i0SQVA1iQRMRf4= X-Google-Smtp-Source: ABdhPJxBmyN7oZfrLpf5wRkVWV2DFBaNuJYgeDwlKpOZKQNuelgplAt68tUdmfNjmf443b2yV8gOLw== X-Received: by 2002:ac8:6906:: with SMTP id e6mr405658qtr.327.1605205416408; Thu, 12 Nov 2020 10:23:36 -0800 (PST) Received: from localhost.localdomain ([181.23.94.194]) by smtp.gmail.com with ESMTPSA id a85sm5297167qkg.3.2020.11.12.10.23.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 10:23:35 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Nov 2020 15:22:42 -0300 Message-Id: <20201112182243.838-1-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: remove dead code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The other branch already covers cases where enable_order_hint is true and frame is of type Inter. Regression since ddb0e4fecdef24e8c7b90fa0a41d13e642ea732f Fixes Coverity issues #1469194 and #1469195. Signed-off-by: James Almer --- libavcodec/cbs_av1_syntax_template.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index bef53e145b..f866dc7b2e 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1500,9 +1500,6 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, priv->ref[i].valid = 0; } } - } else if (!frame_is_intra && seq->enable_order_hint) { - for (i = 0; i < AV1_NUM_REF_FRAMES; i++) - infer(ref_order_hint[i], priv->ref[i].order_hint); } if (current->frame_type == AV1_FRAME_KEY ||