Message ID | 20240505144010.3700-2-jamrial@gmail.com |
---|---|
State | Accepted |
Commit | 82397084a9328d3f67caa9ce519304b714a132ea |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:e68f:b0:1af:836d:81b3 with SMTP id mz15csp909776pzb; Sun, 5 May 2024 07:40:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/xRD4j4qdxbg46hURUJKOdA17fbK7T6Dd2gANcofke1op1vG7SE1JmE0hs4GE0zNrthBl2hp89rTPGtP5ncb2VF3B9RnugHuuJA== X-Google-Smtp-Source: AGHT+IHwkmdeByoQtRu7llRTJf2FvjBfV5xnKRXGgTtpUzMsMlsN2DapDe1eUIxdqMe2Sfv/VAwi X-Received: by 2002:a05:6402:5514:b0:572:5fd1:5cc9 with SMTP id fi20-20020a056402551400b005725fd15cc9mr4018522edb.1.1714920047525; Sun, 05 May 2024 07:40:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714920047; cv=none; d=google.com; s=arc-20160816; b=O/n+2keeQHDlu1BzdnjtW48YKbrBNDZ1k66ykKVAH/0i9XR3rfriOrj8U4pYXrek+v /yGwmBC52P104/5M0PLG3q29NOjPIEsYgvhiUVm+GslJ4Q5lLEPB8YmKGsR5S8qlezX/ wIjNPlWp6TGNf9MW6sMPFjun4/WdYnKj2uYWNXF/3cTnfwSvOTw86pNdvUR+LT2JrUCv BkWxkgLYNLjyGv6Q6RAHOt6Sv64esjWaTYwT2pv7cdHNdP8YDli6LXYSfzIlE1GaxI4G tK77IXEABWBY5//tiJDrlRs5PDp/SbXDgw47KfhkjTq0xyjrRYtw7e3872bndOr/uBG8 y2ng== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=picVkbisjGvlSpiRrarGYhvokG0IMpdqgeWQI7R9RsA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VCOLVqcORkx/4JvzUCTpnEyNMAsuHLGfC1NcZPmtE1VR9YaG2Yci1Gpq/xEbGMtU0O Su+NNNkp30UWb++ESjatjJdVib+c3RqhYJ5sUFCwr/Rz86rzUbNL3bxZ8tWydR4lDNrb uM0uSkpV2O2eaqQDCjyi1Aava8iPYHp77QtisHdsNIElW1VNbBbciERRmAzNPsK4WFfo PXWj7hMjSZ72z+yOIFkMESJT6TLTSdcl6dh/qZDiWrrQQ+/w1B47qnWggh8JmPmyTgoC Mhzxa/1KG5SGxqrkj5mcmpn7hcObFrH8fUvINxLMciOwZRSPiwhksi3vMl6mHQOlQfvN iv6Q==; 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=gK0jbv2+; 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: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v17-20020a509551000000b00572b05c6c04si3799310eda.18.2024.05.05.07.40.47; Sun, 05 May 2024 07:40:47 -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=gK0jbv2+; 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 06F8068D5DE; Sun, 5 May 2024 17:40:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C02668D56E for <ffmpeg-devel@ffmpeg.org>; Sun, 5 May 2024 17:40:30 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ec4dd8525cso7287775ad.3 for <ffmpeg-devel@ffmpeg.org>; Sun, 05 May 2024 07:40:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714920028; x=1715524828; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=mftEfPyCdjdim4Gb+ahXC899hLAggiekJEhjy+Ndlio=; b=gK0jbv2+SWPWadMWZjitzbCiOcJT0qm9abQ//zwmN9E7h4d0pUfzkocfDKCA8cWWzf 3MtsLKR2Tq7qlv72KbAcCvVaROLForV5zBvvbFsKWFFS8NhbbI7gQCZ5U8ElOeZ0RykF mvltucJFZXD8IZLnqtHxpQV0/tocbrHFalNMKjXfyoseaurknu22G8shtp2O4U7feM5D Qp56MHPLHXxIHx/M54XTeszhBFjnIaQywiGewdoKxqcHk+Y7HxEDQVW/2DK2CRnV0xK5 M8xGXuR0b1OK+nTMI4Dxn+nXmeyKj+xV9jpVmuJdk4OAUo8ZDEL7MPmfDkHNcz3HTob9 fsJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714920028; x=1715524828; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mftEfPyCdjdim4Gb+ahXC899hLAggiekJEhjy+Ndlio=; b=F9E9B4Yvv4fXBzyXiTzLS3r0ckfTkS4Oyo+/kOYjIcp8DgSzAFFLspoAxwzSxk4Unh bhJc1UeRN1wQ6ju6FdsL38qeVWaDz69psn6K44+/UOSeUA+I/CZnQRkLUJpnwXPkJsM/ 8PzlyIAkeTrEdXU6GawHFqBQPzHCQjWzf8nu1jyc2FYbDtGYKiUUwOJSzKNJfCRmoJyA O9HlEPtu92hyw5RImwqQNgzp7UyC1CQX9Fdu2PxgyvDI+e1tarGTgYKtb3dAFB4FLcfP WcvwCRoXGBPCqJfrprqLu2EhcKNmLxD8IQdfU4yBv2/5brxr2Gh5BC2cr9kRoc8kzyga xoCw== X-Gm-Message-State: AOJu0YwKcsXGR4vhPLN+3MXd0n7QP6cI1dk0fbzkyC5bBoSoJRJac2NS YuRwxrGj1GcwJk4DfLWvkcOVlL0NqLhb7j5BWeEw9HJuIHeVGIGBeMOtlw== X-Received: by 2002:a17:902:ce81:b0:1e2:194a:3d22 with SMTP id f1-20020a170902ce8100b001e2194a3d22mr8463497plg.32.1714920027700; Sun, 05 May 2024 07:40:27 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id y14-20020a17090322ce00b001eb3f4e96c2sm6533102plg.157.2024.05.05.07.40.26 for <ffmpeg-devel@ffmpeg.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 May 2024 07:40:27 -0700 (PDT) From: James Almer <jamrial@gmail.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 May 2024 11:40:10 -0300 Message-ID: <20240505144010.3700-2-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240505144010.3700-1-jamrial@gmail.com> References: <20240505144010.3700-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_scale: properly reinitialize framesync X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: +vYVqSAHmgvc |
Series |
[FFmpeg-devel,1/2] avfilter/framesync: reset nb_in on allocation failure
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 07e9025335..841075193e 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -766,6 +766,7 @@ static int config_props(AVFilterLink *outlink) av_freep(&flags_val); if (ctx->filter != &ff_vf_scale2ref) { + ff_framesync_uninit(&scale->fs); ret = ff_framesync_init(&scale->fs, ctx, ctx->nb_inputs); if (ret < 0) return ret;
Fixes leaks as reported by ASAN and Valgrind. Signed-off-by: James Almer <jamrial@gmail.com> --- libavfilter/vf_scale.c | 1 + 1 file changed, 1 insertion(+)