From patchwork Tue Oct 17 22:11:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5609 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp679359jah; Tue, 17 Oct 2017 15:12:06 -0700 (PDT) X-Received: by 10.28.129.197 with SMTP id c188mr4393430wmd.58.1508278326765; Tue, 17 Oct 2017 15:12:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508278326; cv=none; d=google.com; s=arc-20160816; b=oGP7wGx9BoqfD5qb+S+K/TLha57nfiNLmjK79fk6RP8FA5KISloIm5lwB2OSK4UQNz Kb6MmRI5kqmdXOLnLx+HzvBWYvA/Y/i1issbFYKK2nCuZ9Q4l/BgHKWbwSahUmJaG/Un sPVLqPNFWZ1TA85RPo3F05plx5HUJDgDlp0r9bfLiGN3yn0rRypP5sFkm+1W9qTzL0YL 6eAuGno/wK+U6K8s76aiXP/d5IWhxGWbkqJP8w6T0YzSTv5V/f2M4izpjqeSAE0p5ohH nUBnoM14MlNirvBwOffA4OOoePMPVqaupBU4DYxZTF3eT8bTY2UFwceJZmwSgY3HDulk OKOg== 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: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=dx1OjHR4bF4isXEX5kNKzleNaueEu4vY+n5jVTkwg9E=; b=tNefsd6AMN2pewCxWAdPSszlL4DGmhWur+N09/vM3t+vZi8iQRqiBsa5vKey7K1XrT 43qWZpClXcYL6YBid7iGUTz05v/Gk/Ums23hPsfIt04TCnn9ndK3Jv3ehZ4UyB6UWGyx ZZq4K64glCXyNE0h2ZRQrKNuL5feyh1l/k5K6dhTb3wkxg+RtSqNJ34Kbe3f8SY9PFuX e1KKs+ijPxZbLJl+0cozJqiBR3oBh9tjs9f1fLLMlx1SXeUEe4IVEZMIj/SHjOUMf0zn 7JtW57blwDZHCgYMnOKk/nbujKt8Zwuzz9eBQL7bJtWztxcH6w6PKww/OWU1JoU/jCPz 4ZAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=uQRFfjaQ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i74si8312503wri.116.2017.10.17.15.12.06; Tue, 17 Oct 2017 15:12:06 -0700 (PDT) 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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=uQRFfjaQ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 434126899BE; Wed, 18 Oct 2017 01:12:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62EF8688383 for ; Wed, 18 Oct 2017 01:11:59 +0300 (EEST) Received: by mail-wm0-f42.google.com with SMTP id i124so6476900wmf.3 for ; Tue, 17 Oct 2017 15:12:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=d9X80lMeXMYJjGQ6yEvZzDgqV1rFHTKHWIbNkPI6RWY=; b=uQRFfjaQc33sOfv8KG1du7We7SkHIKYvrIxPcFjTeM4RF7LC8ZYtqTSDpanOJ+O78V Ty7gFaEv2XMremyp9NpKCmoYOTKozXqCbsp/J/bjXLGA1qd6qj1rawNk+7mNKnofEH8K c28C8f7ROkvwNeZXPPTNWJiP5W18j+Nx5R7AW1AbAHPQ5cvnjrzCHRCS4Q7wYjqOY3fX X2NyE1A3sftgjrKEk5x0JYDpLo8KKLrPDCrPhl5fLitoLkqoloRH4F4U9WUCtVPYMU2s CJ4BV6CHnKro9mCPTC2uSCDfe6VJSMXZb43nJW9Reftet+gOKepv56uUEwCA1goebO6T o/dg== 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; bh=d9X80lMeXMYJjGQ6yEvZzDgqV1rFHTKHWIbNkPI6RWY=; b=OFxAZGreHlh4VRi8AXWk1kZRi1I8OPEuL1pjVTnYpwfEfvaX6ouk1fLV0RKuw36uG5 mohJ7YSFKWxvPYp6AI8rcBQqHXDEiPZYzkV2JlyGBv1CUxqz1f+YrD7ZdnbExSuGdIOI 5UQrlkxduEOVVeoy5I8WfLmLADzGBOiz9eX9MyF0N66ZVKBrKB17Hth9vCQ21emwkJmr dnduxkHtlWSkjaQu1FPPVtNxoFbne/agV14XR9JGriT01dYgdjoiWUkfJMOZwVJIKlWK peV4+fX3FJBYrJl6MMZ/LuCUihGordOGxEPM5px6OpTx7Ja2ogqpeXJoHM+n0eOSZAGY +k+Q== X-Gm-Message-State: AMCzsaUloU2/rCQl8Jai2UIxbZxwLxsNVcoOSSAyDaht8+fushXynIrW ky749mY+Cz2k5aE11y7niNM3gp+T X-Google-Smtp-Source: ABhQp+REmF9zO37/nLd1X4UBGYmrPjr6ge0uGTQxTopGha7YubNK5oL37JXdJ8+M47HUQBRvPw5jEg== X-Received: by 10.28.93.145 with SMTP id r139mr4492324wmb.72.1508278323360; Tue, 17 Oct 2017 15:12:03 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id p77sm13063074wmd.28.2017.10.17.15.12.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 15:12:02 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Oct 2017 23:11:53 +0100 Message-Id: <20171017221159.2349-1-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 1/7] vf_cover_rect: Fix repeated condition 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #6741. --- libavfilter/vf_cover_rect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_cover_rect.c b/libavfilter/vf_cover_rect.c index f7f61038e3..41cd1a12b9 100644 --- a/libavfilter/vf_cover_rect.c +++ b/libavfilter/vf_cover_rect.c @@ -152,7 +152,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } if (!xendptr || *xendptr || !yendptr || *yendptr || - !wendptr || *wendptr || !hendptr || !hendptr + !wendptr || *wendptr || !hendptr || *hendptr ) { return ff_filter_frame(ctx->outputs[0], in); }