From patchwork Mon May 24 01:00:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valerii Zapodovnikov X-Patchwork-Id: 27929 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2493109iof; Sun, 23 May 2021 18:00:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2o00S1D3y+lPD1fUdwqnP5MflojPMuGY5YkwxucnGemKm12Obj9jR1P5vMXPGhAOyc/ZD X-Received: by 2002:a50:9e63:: with SMTP id z90mr23031364ede.342.1621818038431; Sun, 23 May 2021 18:00:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621818038; cv=none; d=google.com; s=arc-20160816; b=BAapQqSxDenDEzZAUFk8iRJSAjwRyZaKkXf1d0WfaIm+5pSjUtX/8KOefS1S54wJAG NCodcP+1NPy+D46dJTFO/a1qb/weh1hPUjuCwtxdHKBKov/GJFtxZOV1mRFZ4HAfVMrf MWZLgnLP1k7uNeBu7O4yZj0FbkAun24xSLZach3GpKLPgw8mruwjjX6Itdwg+56jCy/B 03gtyOUUoIbAfPdlq6p1n3JatJ7/MzshKoCEYKRzGyG8KeTnGx2g+3Slq0VfMJ9ZmHVZ UWULgK0FyARWbWf3qVkDXbGkBx3lXVf+XuA0fAkD0yNaPiafS1zGCihPxI034hpIqLj9 X9zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=oIBIakyK5/PVteZBI53C82HqskH/SVGlZb1T/U4Sqtk=; b=psdJXvh5TZBcHX+/aXSH8sVsnA6s5xPM+REXjBwKBQEAJ5K+NnLNjQVr2h7yxwqUjB P292ajNvb6CI6QErmv0TQSgI6WMlUeiyZvuKqjs7NAjj/lGfTUOYd+cDrh5v0hXdfcDT gaVE1sOvuiIO3XFcJjhCnW4zZiDU25zh6Go5ZvxjZs9ObLH70XlPwsHvXuVTYTZF7jWh ANHJm0998V6Hb9Dt4nBqohnHlo55aYznf12OJcIubxYS3WKUYtTAmVYP7EzNRWurHQx4 BiWi9MIEBbJ7UEDg+fNMX60qbdY51w133C1jEhn+zMpRAYyCNUZMSaG4Ii5NwA7Zfe/2 5MoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VJHLemYQ; 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=QUARANTINE 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 h7si6670254ejc.437.2021.05.23.18.00.37; Sun, 23 May 2021 18:00:38 -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=@gmail.com header.s=20161025 header.b=VJHLemYQ; 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=QUARANTINE 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 8BA45687EBB; Mon, 24 May 2021 04:00:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81AD06802F5 for ; Mon, 24 May 2021 04:00:25 +0300 (EEST) Received: by mail-lj1-f170.google.com with SMTP id b12so24115432ljp.1 for ; Sun, 23 May 2021 18:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=0YTPextq/ZU+eUciur+j72wUfcKZUWhOfKHXEcXXSM0=; b=VJHLemYQAHAec78WqWKWOWotk2v07Ub5EZB8yfZxAX8IAjm87Mia50eEkTJdQIfa6q kYEF60ljCMM0URBsV+RdcdCRrGxxuAY6oCoUP01k1QtFM9hR+vOohtPcokmavRs5trq/ VrQndM50+rhQJyzWMJITvmOwrFKlvx5r636akW3H37HULGkxZmjlW1EP21PKpL4oJ/3z 6Ccd1y5oX+x3Xo2PLditbmW2LR4QszfUege75LLYu1zXvZX0aRdxgveXEqaUCoOvUlnt HiVD3MaOBS6CVL6wjHxtDW/s6FvpKGs2saxx9xz/PKQSBAgUp4X2sPOv79jg1GqA1Moe prrA== 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:mime-version :content-transfer-encoding; bh=0YTPextq/ZU+eUciur+j72wUfcKZUWhOfKHXEcXXSM0=; b=bNl5XCenD8FXTlqlWPpocE2Sia5yTyHNHx5IzaTTR0z3l938Fs7PdpzdCMvnNTw9BV EDAGX0+AlO655n6qTP51RYKY7x1jlKQMBaPqYUJ8NwY+NHHpKvEQrgDOMQUQDrnt0505 C2DH82aDuRbq7scQciHHe+GoQoFsjCI3M478NvvVB7k3ne8tcBQqmrVWrR2P14Ff6Wkt Ju87jY6OVl1bL6O/Fp1iFLAq1/S+cf74aRMyZ0ND8p7wB/TLXI9Idgee2tfh0ytJfRaV tYAAGnwXtUy3vsm+XxW3tcuOlNkH2RL7Rh5aPjWUcAL9zbVrcw3lOBwCEdR4RlwetXMd 6RtA== X-Gm-Message-State: AOAM5323WQmMsj11LTamGFnuDLVBG8zN2XS1d4M7ALdEuYJdL6a2wcJF NRCIgcPTcyCYETFY/imQeeFWinFTQpU1wQ== X-Received: by 2002:a2e:300f:: with SMTP id w15mr15412280ljw.162.1621818024710; Sun, 23 May 2021 18:00:24 -0700 (PDT) Received: from localhost ([2a00:1370:812d:8d4d:b965:d206:5235:139e]) by smtp.gmail.com with ESMTPSA id q8sm1277502lfu.197.2021.05.23.18.00.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 23 May 2021 18:00:24 -0700 (PDT) From: Valerii Zapodovnikov To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 May 2021 04:00:24 +0300 Message-Id: <20210524010024.4928-1-val.zapod.vz@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavfi/signature: fix always true expression X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0V7Ms6c2IyNv Otherwise since "==" has higher precedence, mode is never checked. --- 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 */