From patchwork Mon Oct 7 05:12:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15539 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 B0962447557 for ; Mon, 7 Oct 2019 08:13:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BFF5687F39; Mon, 7 Oct 2019 08:13:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68EFE68023F for ; Mon, 7 Oct 2019 08:12:58 +0300 (EEST) X-QQ-mid: bizesmtp25t1570425171tcockm7p Received: from localhost (unknown [111.192.118.67]) by esmtp10.qq.com (ESMTP) with id ; Mon, 07 Oct 2019 13:12:50 +0800 (CST) X-QQ-SSF: 01100000002000K0ZRF0000A0000000 X-QQ-FEAT: 8GRh8dgRWfcjHpWGZ+BOoJ6pgg4wkTKUyUuGsaeo6wbSrR8KON2DeWNiklhNp 1jRBMow6IJwAZFxuZ1pJjSTA6FPtSZ1DcAcIDUlm1/ZbghJnpYvB12ysAxQqYasfQ1GeVMF PGEzsDZpVCsK7SNL7PCKYdqNZmqAA6OsYBcXAD7uyI+Mu642RBNNUrArZv2ie1jkF8/uNE0 tyD1NxdkUefLiZCf842wazt8pFJJKkZkLcNe13KiMWG6M1AFyJ/jvwAzoMBVNTaicdJNk7c NQAXy6PKIbR+uiY7d6mUj3j3ZmyHop4pTgZYk8NpEfxphOTNYx/JsauTSGPXQmvtoXzQ== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2019 13:12:46 +0800 Message-Id: <20191007051246.93315-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.17.2 (Apple Git-113) X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avfilter/vf_delogo: make the interp value compute method simple 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 Cc: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" because the interp >= 0UL comparison of an unsigned value is always true fix CID: 1454642 Signed-off-by: Steven Liu --- libavfilter/vf_delogo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 376c5e850f..3678548353 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -168,7 +168,7 @@ static void apply_delogo(uint8_t *dst, int dst_linesize, botleft[x-logo_x1-1] + botleft[x-logo_x1+1]) * weightb; weight = (weightl + weightr + weightt + weightb) * 3U; - interp = ROUNDED_DIV(interp, weight); + interp = (interp + weight >> 1) / weight; if (y >= logo_y+band && y < logo_y+logo_h-band && x >= logo_x+band && x < logo_x+logo_w-band) {