From patchwork Wed Jan 31 03:25:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wuxiaoyong X-Patchwork-Id: 7468 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp2315000jak; Wed, 31 Jan 2018 15:02:34 -0800 (PST) X-Google-Smtp-Source: AH8x2277lxfTj8nVxGvBecJUZRGIgK+OnedTN6wlI2wQAIjOkB8xuu50eScdKxOSDb8zzv2nu4DR X-Received: by 10.28.194.137 with SMTP id s131mr742253wmf.3.1517439754308; Wed, 31 Jan 2018 15:02:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517439754; cv=none; d=google.com; s=arc-20160816; b=M6L3XpyrDvuhcKaztR/TMm+cvFpz9mtO+fbccsL35OrgzvCHNTI5aKD4EQFJvlIpOK KeT0HrB0msbl1YxPHNB2uxVC+vRKib8+RXzOdErRoQq42Z2FmW2pmDJP2rlqLL76vWOd 83HTM3V1YHm6eCv1SZG+zakhLBXSFPlLZTk3NmFp45cDOVTQ8nx9M69Fe8LDwG0dFZur WWikvLYZk4y/6pmneNwLHOD/54dDU4icvMa5s6uSNkeb9Ksb4YAVb9kP4XvytEnBKIEo 62QIjB4Fkv8zV7v084O4AUu8nGJIrE0urvKcrJTBaWXxAylY+On/sD1LqPXtt9T7qQpG NIiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=HUXhkf+2sMXJFVFdOgEEC7RPCiT7gwGT4P++CBgXXRM=; b=v9aUrE7X8Yft9ifY7tlFbXpCX/pXJjC1yS8sHDvPgXup7Vff+U8UYefdGywgmMAuGF l/p//Y/pfmepGdk19lbhrzMInbCu/YDurQIxo/OoznyBiZcMRU2NVg6UtAhBIF2F20bU WMj6BggpGi3RwKIscsBHC9ZITpDSjx9I54cgPGI4BHryM1MGqz1dSAzWeNHs7DK6+C4t REcyLjba2Jr2mKIXBMS6xqDRF0cGzG+UQPlGT0kEwKBigzW+nbe2EKKH5LVc4hkKobD4 6CM994C2KqkMfln6403rbepsJoUB//htpghTkPKy+DeDstu7jGg8/M83dfL5db422dE9 F1ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HyO23/y9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m32si8213191wrm.512.2018.01.31.15.02.33; Wed, 31 Jan 2018 15:02:34 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HyO23/y9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1020868825B; Thu, 1 Feb 2018 01:02:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46A8C680D23 for ; Wed, 31 Jan 2018 05:31:20 +0200 (EET) Received: by mail-pf0-f196.google.com with SMTP id e11so11221244pff.6 for ; Tue, 30 Jan 2018 19:31:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rFFTCAR5rGVGWXpeAXDD5lluGkspdKvgllaol04043Q=; b=HyO23/y9S0QFcKCO/TV5qfZRo+Yk3cesINdKAmWfSq5Mv6gsme31do9wbGOSHgj7At F6WsjbTPcamZMXvx6OagxwQzeUtzMLK1D0MF+Nwa02N+TJ/KBY/GZO9/hC5zvhmytQ4A YXHoUlHX4C0G0gfkw2hxBPN5HoyCypg5BkWMt0CGSuaIYoYmMkyg9vXGulk4gRYdwIkS 6FpNhJyU0YOS7BCcp8UYdDMwqOeFFAwJETyxmOOR8ZIUmcdBJ4fTCajyGPVOV1mTKMO5 Wkas11ctH2R0xzSUFYLeWwnL4YzeGJcyiBTuCiiZ3f7klLvuqz4cClt7Egtg5wO6OI93 JGjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rFFTCAR5rGVGWXpeAXDD5lluGkspdKvgllaol04043Q=; b=OkGs0xvQx9akto5vzomv7RGAGDSehEx3j8w16qOgE1mBayO5XcP13MQ6SHFXHRUnRq zE9N8jdlc+QRqdQSqLtSna16m0PusXYiP7/GKAF8J0IhscvdthZUaXvfNMB3JexVxIR8 YJOiZVDjjhmlGHDSWHEvV5KP5NzRY5vPle7dfu5z3T3/0gQmOqmijppxY5DTgUGdzbls bSCaLzcZTV4BqzqdlFAASLc5IGsCOWFVjo9yenLHLTWsw1l2lGZ8XPfX9jXKLXaXxMnh 1Qi4A3vrQDQoK3/IS7lRFb1t+geTHzkpH43W0A/h68JoM7E0FArcUqDTgY/FumBl0Q+W ReRA== X-Gm-Message-State: AKwxytcc2mM2c1OdHsep2ohhKsZ8YmuIgtIg1PvYZSfjiCIl6oBBphU1 1JbStEgi3xopaaEwrffECL71ag== X-Received: by 2002:a17:902:7586:: with SMTP id j6-v6mr15105865pll.23.1517369133128; Tue, 30 Jan 2018 19:25:33 -0800 (PST) Received: from localhost.localdomain ([45.78.28.99]) by smtp.gmail.com with ESMTPSA id a9sm33917696pfi.55.2018.01.30.19.25.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jan 2018 19:25:32 -0800 (PST) From: wuxiaoyong To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Jan 2018 11:25:00 +0800 Message-Id: <1517369100-13756-1-git-send-email-bonderwu@gmail.com> X-Mailer: git-send-email 2.7.4 X-Mailman-Approved-At: Thu, 01 Feb 2018 01:02:25 +0200 Subject: [FFmpeg-devel] [PATCH] delogo will fail if interp is zero. 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: wuxiaoyong MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" With ROUNDED_DIV operation, if the first parameter is 0, it will overflow and return a very large number, delogo will fail. So, if it's zero, just set it to 1, it will not affect the result so much. Signed-off-by: wuxiaoyong --- 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 065d093..73ad6b9 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -126,7 +126,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 = ROUNDED_DIV(interp <= 0 ? 1 : interp, weight); if (y >= logo_y+band && y < logo_y+logo_h-band && x >= logo_x+band && x < logo_x+logo_w-band) {