From patchwork Sun Feb 18 19:20:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stone Chen X-Patchwork-Id: 46353 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp895854pzb; Sun, 18 Feb 2024 11:21:19 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWoyBoRXkGwvWqS+n3Mv8HfzdavyCFN00VAzntiT5xPcuFCOr8W5/+5P3Qk4ZXo9CjcPt4KZ5AsGsiBFYkxCX4sFibEwyc78WVDfA== X-Google-Smtp-Source: AGHT+IHDVUzUr3tZBMxfvafZgYvJi+DAUOy4JkwOJVNwZ9lKFHxbnr7Bc2Jzeb7NIcGWxjlzQqy4 X-Received: by 2002:a17:907:7754:b0:a3e:9651:1241 with SMTP id kx20-20020a170907775400b00a3e96511241mr392969ejc.2.1708284079608; Sun, 18 Feb 2024 11:21:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708284079; cv=none; d=google.com; s=arc-20160816; b=XThlbghU4aD11DNRRnEyPBPMgWU8U4bYtlCPVxMYxfpz+4DVyohwe6KXOo9h1Bh2x4 zAvWrOieoElRkSx5CjrSeDmNKYnhoKAVh8TP5CgRNJ69i3A8aBPHYrw17CxSLoumpOUV OX0K4rkFPIUF8Hxu9QAj+bC2K2YztWy32nj82ilNFiTyFJC7sdIRipFMILBn3EDXKSho nu2eAhu5Uct5iR/nzEprzvhHR0wrpU7uhN+vLEHdiDOOvmTX+AhYRp3Tq0ce8NIHQEb8 qgRK6oQPIlTIgV0Qiu5X/5QNlbIcl/tXXmvwdaTO/LJIztufvPK0pUN8HP88YCZfYKAH xILA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=VN6Hh6h9IdHfpDOxK/CtWi2IJsOI8kYPnaZSMnjam/I=; fh=eXL0VfxTysmJvjluz5gzyadDwRdHpiPfPZqJ5KBw8Sc=; b=Y4T/LQTKKh3lkSIEUQyTXQ9CvVSeAOR8a1bLOAJW1ic1Q+3gikyUdR9NGfXOXzUDr8 JMtd7OAqT3GJ2LxbPECRDCopUU8HR4FwSuYxAUwyd3C8e9aAPYbovoN+gcosCgLMZTh4 JEW2ZMeWEcf8n2mFgTCmqmS+N3Vm++d7shJCHRJzTHUtV6BwEfsr7ahlCv4dxzXI6BhJ CwnF8pW0/nO/Vdmp0qlYkNCHcyVaBKWTOv6CUpo01zmaqZ2xKxnXe+8OBJbiUbeixp5W SQ/f7BvvFWAqP13LTMOwKHjD423n81/ADwjZLwJpfLfStk37IGtTPyh3qyRF8Djxl6T+ xvDQ==; 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=DRClZqas; 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 b11-20020a170906490b00b00a3e7f932d50si485067ejq.1038.2024.02.18.11.21.19; Sun, 18 Feb 2024 11:21:19 -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=20230601 header.b=DRClZqas; 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 74F4568D388; Sun, 18 Feb 2024 21:21:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D689668D302 for ; Sun, 18 Feb 2024 21:21:09 +0200 (EET) Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6818aa08a33so35508636d6.0 for ; Sun, 18 Feb 2024 11:21:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708284068; x=1708888868; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tiwgAqRHqjTVIE1jAkn89vo37MYYaMickAEoYVKIMZk=; b=DRClZqasqZVoWIxERopJrbfitLMrF47dU2tjvLK9Zsb4aUihXdxmTr0j4h9c/7jtvH a6joJ+5DU3UedoxFkOaGH2hhWu/qHCCOAxqCEDRsBsbCSnnFc2i5cr0WR+w/RHtj+a6q jcl1s/YoaTcPdRzHszN6HsHs8zmdwDx3OpEv7FAjQ9lBvJX6rpEEPc74FFSdo6X3zsZT UMhcfWjsbYgukBzQiGxaBdh0abB6HBxWmi1dPCQTMMkmsAJmZAquUy3VyE7m030BPouF E4mwRUItUviBb7CD5hmfCMSmVA4VIkI+DP3xJE+DpZlHg6mW9gnYX1bU6HNv76X3qedE S4ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708284068; x=1708888868; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tiwgAqRHqjTVIE1jAkn89vo37MYYaMickAEoYVKIMZk=; b=eI4wJuQbXqSAzoIAt8ExNqY8zW7gAUdSlBrJnndmtqaGId+br1+l3GCsztxHebEcoC BI+Ryvgh1k8w8v0HjPmHYFYuqRQsI39h38FDmcU1ACxZGlazLZawgsspvvaYBJvJ0zrx T3fcukt7TIjF8zDq5PPkd0dm61cTGMt9ohkaxmqfkACRM98x6D9GaiWJQjdERfAgfsVl gmFWJJvIF7k1GbZMeKyyhWjWZo/BjUni6gzjSzS9y6UjG+394bBoKC1ablJdI+VM6hze 6NRemNw68vP6gI4hRQezC4FC5Scmc2z4YXBeNLH2K97epQ2VYeu1ywROKaX0zt7puw2Y aIBQ== X-Gm-Message-State: AOJu0YzcPo1qkF6CTPrNSAlwEZtDQe1ISRZ5idExgZoTj5k/1iYOQaFv Y3rHZkpjEjDeciG47pe3KoT6k2LVpAGqTzsA9o+bA9UTgzclCl70OvnrtTUUf2g= X-Received: by 2002:a05:6214:4386:b0:68f:361b:123b with SMTP id oh6-20020a056214438600b0068f361b123bmr11386674qvb.15.1708284068204; Sun, 18 Feb 2024 11:21:08 -0800 (PST) Received: from fedora.. (209-6-133-125.s1659.c3-0.bkl-cbr1.sbo-bkl.ma.cable.rcncustomer.com. [209.6.133.125]) by smtp.gmail.com with ESMTPSA id ly6-20020a0562145c0600b0068c8be959a0sm2329622qvb.111.2024.02.18.11.21.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 11:21:07 -0800 (PST) From: Stone Chen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 14:20:38 -0500 Message-ID: <20240218192054.665995-1-chen.stonechen@gmail.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Unsent: 1 Subject: [FFmpeg-devel] [PATCH] Fix rdiv always being set to 0 in vf_convolution.c 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 Cc: Stone Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5bjn2eZid7As In commit 6c45d34, a line was added that always sets rdiv to 0, overriding any user input. This removes that line allowing user set values for 0rdiv, 1rdiv, 2rdiv, 3rdiv to apply as expected. This fixes ticket #10294. Signed-off-by: Stone Chen --- libavfilter/vf_convolution.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index bf67f392f6..a00bb2b3c4 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -674,7 +674,6 @@ static int param_init(AVFilterContext *ctx) p = orig = av_strdup(s->matrix_str[i]); if (p) { s->matrix_length[i] = 0; - s->rdiv[i] = 0.f; sum = 0.f; while (s->matrix_length[i] < 49) {