From patchwork Sun Sep 8 18:05:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marvin Scholz X-Patchwork-Id: 51438 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9c4f:0:b0:48e:c0f8:d0de with SMTP id w15csp1401127vqu; Sun, 8 Sep 2024 20:44:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjRfCaO3zVwyrvpJhSXwsTuMNoj27jpp3Y1RZxSJQRBIYU8ASvnCF6BMJ+VE0cgnCyd6nIcrRn4D7vecVyxWtC@gmail.com X-Google-Smtp-Source: AGHT+IHsIzmxo30WC2Z8EyWfTOilgZhWg9CI0QcdFyWOUngFiNqM8lSulWa9Q1Y78ysvR/amK3RB X-Received: by 2002:a17:907:7ea1:b0:a8a:926a:d000 with SMTP id a640c23a62f3a-a8a926ad660mr335655266b.5.1725853451621; Sun, 08 Sep 2024 20:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725853451; cv=none; d=google.com; s=arc-20240605; b=OS+vUucpw7eH+YejRf5xbDcKTQXVEWUzJa9LGNBOlPCbqXThscEpBaXSgvflay7jO0 rh5ZZuJwYfRGwa5VxF7CuTTeBOTJ2ER9mQLb6vWxUQKQOngUN3iDUswF5sC1v5HYLIqU vH3rDxW1jni03epVNGZ/YSUK4BJJEVvz8c35hf11mcJa8FhMAvR/NPP/ARaGEtwWnUKS AypKgQP35ZCOnUtZUkvO4ntyQJfitbUFhSsfEThgb7mQbFEXgEKkZlTLDVygh4wzHyWo RkMNPeX7blsrIv99HDWW21jf+NBim3FOE0P2KgEIL0GXNFp4IhiNnqyLHGIENq6iH/GM Kp4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:from:to:message-id:in-reply-to :dkim-signature:delivered-to; bh=E31z1kpMudithFb+cdyGIqBnchB1mNeqIMgBd4fquYk=; fh=5IeVwzS1vbVKjIV8MP3mnmnRtZGb8uteQ9r4QD2keV0=; b=TfX0tHFLS1vs1wGkPfaBpnJHQpLSVsFtaaR/ILIHLTLifXRnXt56X8Jmv+STFTyP5p zsD/VZu1XkN68hAx5/fZZXwkNi+CxsDulW6WlY3PA7K5my6H7iruWjodGy3BtLpkSdTE n93HtPnlyyQUAPHufUgu5+IfaI006piwDsSPEBU+jagnSH3V01u1axS6kdTPamb97m65 piiawbUjFMeqgcA+DuU6Zxypv/GyvqK0q+CFXQI3pZxguiJ/nliZ7CVaGlCQfLsqVqsY 6zne/AAeppkkJgu0uFvOshVIFtUqBWJfFu+JavTsYh5D+7w+/iZCzzO604GMz1EwshU7 XaGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=OHXPlTLc; 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; dara=fail header.i=@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 a640c23a62f3a-a8d25ce9764si317723166b.493.2024.09.08.20.44.11; Sun, 08 Sep 2024 20:44:11 -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=20230601 header.b=OHXPlTLc; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6697468DBD2; Mon, 9 Sep 2024 03:55:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1F3F68DB02 for ; Mon, 9 Sep 2024 03:55:09 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-374bd0da617so2286238f8f.3 for ; Sun, 08 Sep 2024 17:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725843309; x=1726448109; darn=ffmpeg.org; h=subject:date:from:to:message-id:in-reply-to:from:to:cc:subject:date :message-id:reply-to; bh=D8VVVwMQTsnrZdyJHaPqfMRLwB8VcZacMXzLam3I2r8=; b=OHXPlTLcyAJId/1D7k8iC51wavbt3chOIikDp/GckBO8btwvtlUdLCU2uRxUaoKjFd o55RFz/3nN/PIKeRxevdTYaSJMMK/5C+/TwkRdFcSLuonscOUR3Mgg4Y4caeMLSKQmiv PkngiyKITPVqeWxaFwEgF1AwVdRsjcMWImrEXZ2shq9JStvOtJM3aII1Urj9rw1TYDRv FIkJZ6+TNGhecVFXrsXOdorTt68vFmEvQCHWwPTZzwr13ylsMdsu1fLPJik6hIM6O372 qW8QtDeAmhWe1M2ukszuiSvoDT56cfKfK8JhUZlO6+foeKZPsSCbcfsrvu9ivYk29vRp aMoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725843309; x=1726448109; h=subject:date:from:to:message-id:in-reply-to:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=D8VVVwMQTsnrZdyJHaPqfMRLwB8VcZacMXzLam3I2r8=; b=PEFZsJSpv2kjM2+cW/oNl1Kf3qdsuZFqiSbS+tLXR4CyVn+IccyKNIROT6xgn80UfB YQxVSz4waPNqolLG7XaQoklppakkY8JKC6+fzpyK2ffLhZGVZwD92NwolvN+gFyEt/Yx yqhjJcNgoHzXIYljiLwYTkJYFvKlvxZisoV/qpmSxEHVGvYVe5KOrtxigfgSo8vJ8KIt lxB8TD8nbCHZEqd61Ge8M7djuirdEfo8cSL47AFl1mFun9psS21XFD4JncO3q54LRyPy vmZ/k51UKGqImVjbhkXmq14ND4aFUDnTcoFtlvNUrR9Dp5FskU/ep8OGmFa8gABFafoo Ex1w== X-Gm-Message-State: AOJu0Yxu3fBRA5h0217ynR/qs7chPVLcMhBoTKYo+ptEjVsnc4h8WKP0 nTlF6NwZjdybWshSUfwFjt3i/R0eqRhpOUjEs5rpHthl5DYUjVI2zmeXhQ== X-Received: by 2002:a5d:484b:0:b0:374:b5fc:d31a with SMTP id ffacd0b85a97d-378895de475mr5864482f8f.25.1725843309119; Sun, 08 Sep 2024 17:55:09 -0700 (PDT) Received: from localhost (p200300cccf1178009d94fda8472792f7.dip0.t-ipconnect.de. [2003:cc:cf11:7800:9d94:fda8:4727:92f7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37895649728sm4583399f8f.16.2024.09.08.17.55.08 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 08 Sep 2024 17:55:08 -0700 (PDT) In-Reply-To: Message-Id: To: From: "Marvin Scholz" Date: Sun, 8 Sep 2024 20:05:57 +0200 Subject: [FFmpeg-devel] [PATCH 09/60] lavfi/vf_vmafmotion: fix variable shadowing 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 65KaPBCgYc0S --- libavfilter/vf_vmafmotion.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index f9315e56b6..a8adc67019 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -90,11 +90,10 @@ static void convolution_x(const uint16_t *filter, int filt_w, const uint16_t *sr int borders_left = radius; int borders_right = w - (filt_w - radius); int i, j, k; - int sum = 0; for (i = 0; i < h; i++) { for (j = 0; j < borders_left; j++) { - sum = 0; + int sum = 0; for (k = 0; k < filt_w; k++) { int j_tap = FFABS(j - radius + k); if (j_tap >= w) { @@ -114,7 +113,7 @@ static void convolution_x(const uint16_t *filter, int filt_w, const uint16_t *sr } for (j = borders_right; j < w; j++) { - sum = 0; + int sum = 0; for (k = 0; k < filt_w; k++) { int j_tap = FFABS(j - radius + k); if (j_tap >= w) {