From patchwork Tue Oct 8 03:45:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15552 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 A5240447927 for ; Tue, 8 Oct 2019 06:46:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77AE5688161; Tue, 8 Oct 2019 06:46:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgeu1.qq.com (smtpbgeu1.qq.com [52.59.177.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18DE6687F22 for ; Tue, 8 Oct 2019 06:46:43 +0300 (EEST) X-QQ-mid: bizesmtp19t1570506336tup81cb4 Received: from localhost (unknown [47.90.47.25]) by esmtp10.qq.com (ESMTP) with id ; Tue, 08 Oct 2019 11:45:35 +0800 (CST) X-QQ-SSF: 01100000002000K0ZRF1B00A0000000 X-QQ-FEAT: 0Rn/IsWJUIIg2GeTREgbi9EcU5O0zZv310daR08mRtALnu2ZzvkvNiQk5SLSS TER4EEh5WuxhCk086TyxcoLitPgA18Lf8v9G1Txv8mJUthar5N5RfOmAIDgP7Yn6qodxBQm fHxUPyd3G1qomRGrTj/G/mGNwPyPDzGQJRnHxaKqNOmO4NiD3W0sWxojZkPvPZ8mhNoew4P 3TiYOs5LC5IW2iAi4UorC3bW7HVkaoS4gBLUNjpWi2+Qo7pVrGOF/fAuzQt9Vhb77i66Pca m07oivS/n39bTZJMdrKQa8TRqczOFP6Sov8dNBt9b/FUs7Tsi1Fqa8ivs= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 11:45:33 +0800 Message-Id: <20191008034533.28675-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20191007192940.GA3219@michaelspb> References: <20191007192940.GA3219@michaelspb> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v3] 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..a268b3e9b3 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) {