From patchwork Tue Oct 17 22:11:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5612 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp680050jah; Tue, 17 Oct 2017 15:13:00 -0700 (PDT) X-Received: by 10.28.34.3 with SMTP id i3mr5029344wmi.94.1508278380101; Tue, 17 Oct 2017 15:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508278380; cv=none; d=google.com; s=arc-20160816; b=c1nH07Pbqz0swK0MVt5Q6/nC5SkAH/w980dTpizYaQoPw1DHGCXwzo3cGXQnj3Bp7Z N3fVMqV+uCP2csy3orEJAbXlesPf6DsiCzQgUsskrKDSk32iDUk19wIxb+IY/RSnFZow iaKrZ3j6dyRLabEU11L0/vm43bQ5Rt0KQZIdPdfQCQHUesh23V0RooZTY9Vl7TjSD6dx klFKhjjCfkKNxNb3OkVKkzM4tss/2ajUnw1NBut3m0iJb0DX9Ny46NjNePHtZaLbM9tU kd/s0S+Tm3e9ij3bB4ZgZEc4FayrVQR859xqBjQMybGqYPeugkXy7fG95vwp7QtPGYO1 Y6Kw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=ukhfeB1JUQ5A2Ect+ldxEAEpZyZF1Uz9fNk7FFyYdfc=; b=JGSTzyiNOmTaAGDBTxlqpoey2fmXAT5b/UKD/Y9PZCvf0zPOWIZUN6sTTwhfjpoCCG 6SqkU2odtCTHHBAy5X77dYA79pP3xBhnfbbilANGr3z/CKiHw63aBHMjttvlZUtFFbf8 4molU9BVQJcIPKe30q2LDt+/smqdwe6NVv2/Aw1TQM4LBiGR9l/KI8Zcil7aeQ3XW4yd YXvuqy5qqddeMxR0ekyCVcSBIMUE+4TuIMa8lRUkXQgdURAPCv5j5lv06qXIbWUc7Cfy ZBNi+d8mVNre/0Jv75WTqNHO/7yBgFGkVc5RWBKS+vCaETKDAflikyxlYhlZwWDS9ACJ Z8tA== 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=Xp1gewqe; 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 5si7469786wme.0.2017.10.17.15.12.59; Tue, 17 Oct 2017 15:13:00 -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=Xp1gewqe; 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 C135168A07B; Wed, 18 Oct 2017 01:12:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f173.google.com (mail-wr0-f173.google.com [209.85.128.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32063689F25 for ; Wed, 18 Oct 2017 01:12:04 +0300 (EEST) Received: by mail-wr0-f173.google.com with SMTP id p46so3170874wrb.0 for ; Tue, 17 Oct 2017 15:12:09 -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:in-reply-to:references; bh=CfQ4J0T59/1u5GgmPRDCBiofy6Wy+i9HHVNFWPBUKfQ=; b=Xp1gewqeoiYwfTfwHoJmUPsAcsCci8F/hUEGOjKlqB3PPVw9ntCnKJ5MCAX80ZauIx hVLQBermCoud61TDHg9hAIByrh+wuQabXbbnysnKYY+lrmPsa0JNNfCx67/Ydppf7tkZ VJj1QZAsu7vuJhtFzP5uI9mv8+6iPgm8XrgYnEqQX50mUtz0hDV7FIBTYz7idkLgQ8fE NPsHsM4lYZ089EodjGkwqGPqsgi8/fE/zsWhjLqUyOZCtdXP8gohQm/scjLCmnplcYKK KL/sWP+vRcWfMlFB9xIpb06itOeoWYIK0UXJ+4OE5yuiBLEDwu8eiXHchl+t/v3xJN3B 3E4Q== 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:in-reply-to :references; bh=CfQ4J0T59/1u5GgmPRDCBiofy6Wy+i9HHVNFWPBUKfQ=; b=WM7ixBZ+ATNuPxqipH2An3yOkLx3OKTqm3lHF+XYC2l5zxK/K2qmpVltnsOfhpFQLu nUu47KHDzF9Acb/SXB3rp8Ave5IQ4dGLQOwYrjIEddsWDYWm7QG5dAE0SRhvgfzn7wVB LxSfNLqjIY5zsTtI/ucoqkV7obpv3woFnzHw4H0NIfWS/+AyLLS1sKcGfJMtIVPqBcvp uA1xlrNFKO1C0HAhsbVIZd670VVnsqYXSt0xGAiD82YOsK5ePs09F2PJzfObKxyz3NVd flBcT3z0Ttf4g/Enqh95NeMMfjoTqZTpbuJn2g+I68Rhc6a1PcKRmdlMqA3Tye8gMGYT os6A== X-Gm-Message-State: AMCzsaWbk7Kaw2nN5GfwkQfYF5QJ5pRWrhhvTMwt1tvwVucUcaypTzgF z2Gh3qqoN81nD4Vkfy/N1/OMaWIs X-Google-Smtp-Source: ABhQp+TBk9Hk4FxthWCTVIZUjtsZf17dG+1/9N9GL5/jv+4XIrV+pfdHjMhGTYzxeHtO8ut0wDPtLQ== X-Received: by 10.223.186.201 with SMTP id w9mr4732108wrg.230.1508278328387; Tue, 17 Oct 2017 15:12:08 -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.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 15:12:07 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Oct 2017 23:11:59 +0100 Message-Id: <20171017221159.2349-7-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017221159.2349-1-sw@jkqxz.net> References: <20171017221159.2349-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 7/7] signature_lookup: Fix operator precedence error 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 #6754. --- This looks like it was rather broken before if the condition is ever meant to be false? libavfilter/signature_lookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/signature_lookup.c b/libavfilter/signature_lookup.c index 272c717c77..85e879d224 100644 --- a/libavfilter/signature_lookup.c +++ b/libavfilter/signature_lookup.c @@ -491,7 +491,7 @@ static MatchingInfo evaluate_parameters(AVFilterContext *ctx, SignatureContext * meandist = (double) goodfcount / (double) distsum; if (meandist < minmeandist || - status == STATUS_END_REACHED | STATUS_BEGIN_REACHED || + status == (STATUS_END_REACHED | STATUS_BEGIN_REACHED) || mode == MODE_FAST){ minmeandist = meandist; /* bestcandidate in this iteration */