From patchwork Sat May 7 12:04:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan Doshi X-Patchwork-Id: 35678 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp2133107pzb; Sat, 7 May 2022 05:05:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaK3IQ2NV1Fr/JA05X8l6zQTjEWgsNhl0VU1FoLpbQO0JYrfaqnS3+b61btK/6x0py9PpX X-Received: by 2002:a17:907:94ca:b0:6da:b785:f067 with SMTP id dn10-20020a17090794ca00b006dab785f067mr7211622ejc.654.1651925129708; Sat, 07 May 2022 05:05:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651925129; cv=none; d=google.com; s=arc-20160816; b=llE34Hv01JcQReH3pM+qaeUbGHBtBoelBP5RZCgUzjvjin/qbs9p09NMiFxo2M9Ta/ +agrLZ97hQ2swt1+ON6I4/dN/oY/gw/YXITNlzlJ/lsahugmu9Yy++RMa+h4xL6jDM7M 4fpncMUK0fTIMyDtIYJqoCCoWPOcWpImVdqQocTgsnTzerCDHlIEYeiSmb0uoVDzGjTi e0eXfrUPQlnfEWrU1s7LqA3K12QfcA6jgKtImOharwqsh1bxVNfU6IzdPDYUJe9dmYOR ebpUCPQM5z+dGb2LPRFD4G0idvK1etD8GMtlqgEyBghXvLEGGze6JppeJHI5vEVQmAbP AyPA== 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 :delivered-to; bh=oPbEfSzoYtWvT1CMAt4VC9I2Tow0lNrEXr4+plGG9wM=; b=UJfIYo9pmlmo2qy2VOZuA2Nd2AZBQzPSHfGaVZNRBA2CXyp5NVJQAE6zqZatnGjR8D /y0oJuNqMlBgtEyCl25PpEDRsEr1H/NMMscvhmVETcROX/cmjmTZtyWfjdmulSzWgR/L NmrdBIEqgmYoxRHQgyK4xgi37Pl4HpFDtoKWMlfv8Ft9PA1L9HnsXK9L2Ou/EFA71r8i OdXe3rHARbFXQGcuTTn+LInjuDAljtXX1KjB8nPLSft8meTB9Adb7+cmgyF8xvk2u2Dk dAyvrmIhyktDNk7pNRdKC0P1JAhUgSh58lvmr3h844FPLyar8JsmjVC7FaYPX1hl+coC WhFQ== ARC-Authentication-Results: i=1; mx.google.com; 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 f16-20020a0564021e9000b00425d4bbd155si8759707edf.3.2022.05.07.05.05.08; Sat, 07 May 2022 05:05:29 -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; 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 3DAF968B3CD; Sat, 7 May 2022 15:05:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74B2E68B36F for ; Sat, 7 May 2022 15:04:58 +0300 (EEST) Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KwR2K55wjz9sRW for ; Sat, 7 May 2022 14:04:57 +0200 (CEST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 17:34:39 +0530 Message-Id: <20220507120439.6558-1-ffmpeg@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/geq: unbreak alpha processing 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: bRjpJ5NoM/We d607af50fd broke alpha processing by always overwriting any supplied alpha expression. --- libavfilter/vf_geq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c index fd9e0fd80b..2b53980278 100644 --- a/libavfilter/vf_geq.c +++ b/libavfilter/vf_geq.c @@ -275,7 +275,7 @@ static av_cold int geq_init(AVFilterContext *ctx) if (!geq->expr_str[A] && geq->bps != 32) { geq->expr_str[A] = av_asprintf("%d", (1<bps) - 1); - } else { + } else if (!geq->expr_str[A]) { geq->expr_str[A] = av_asprintf("%f", 1.f); } if (!geq->expr_str[G])