From patchwork Sun May 26 23:52:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49288 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp2958890vqf; Sun, 26 May 2024 16:54:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXAZZQlmNLcgtEZm2k0/jjkSBnRtHl5HQcfK0ji+9Ty0tZLelucPLucOcD02tE7/XL7XUbv+OQl/7OMmZAbBSApT05UCKkH7M4+pQ== X-Google-Smtp-Source: AGHT+IE2gGRxQXNBcM9h6GSGncEEXDIq/NvUgy3+JyKUZ69bVow0URTGnF8IYyK+dxiHSyNHG+2F X-Received: by 2002:a17:906:24ca:b0:a5c:3072:5084 with SMTP id a640c23a62f3a-a6264f0ef6emr524177266b.59.1716767662008; Sun, 26 May 2024 16:54:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716767661; cv=none; d=google.com; s=arc-20160816; b=MzuAPxOgmUurDQ0nH2GEoSJ/lSEZYUzStNK+RtoY62UKQFFJj9lBW2tnUC7Z2n1D2c O5v2pMJgomav0rPhJiSHQvd8iO3m73W6E7EfmdNbUcQ2BlLTSkevhdgk0i6BN/hLCs0d La5X+fxmu5l4PAKgJUidSfJOesd49Ji9rcIJ1plvknZEy5v3txUwRqVGj+1YhKfbrZOy Ag657S1iac46SmVVi+Fe58wIJYILScMKsqOxlLBomyR21csYqWxGzcJegMZTu2ieCS+S pptZlQV0U51eil0/SYW/NtNxlbJtdD1iQBBClivkPaLqhNuzunSF4mk6b02OmOj+oTid 80ng== 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=KlVXasPzYQC73cBv2JjI4+mjz9C+UjHfXbM4AoOLg6I=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=bdZFrhIfPLRY8Wc7Rducni6Fto1ll15I4KnrGEgqU12eNH6QJjJYjpofRGz+Dz14kv d2EpXLW+rYL78FRrVAyVcARnlHiSmhxJL1nUuq3Y7lBdo4WdhJswUjsYWISN8QbSYJTO Bau8H7gi+frVizsFoslM/LqzT4K+GTGoNA9VHo5K2+IqPqa2q8e7SXvgk4hrPnJkygKv qVLgmyjFv8qgxfCOVV48WvBlncegKrHrW3HSM/MU9VWvjoQXBYfKRadT8mm4k5jnSNh9 ITsV/RSBb08klVNEbqvKuZfNjO70lxVjx59zXdYd1Cs1JmQnJgIf+vlOzHnreWp26xdL eXcA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=mW6swurg; 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 a640c23a62f3a-a626c800867si320484166b.94.2024.05.26.16.54.21; Sun, 26 May 2024 16:54:21 -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=@niedermayer.cc header.s=gm1 header.b=mW6swurg; 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 DBBB868D547; Mon, 27 May 2024 02:52:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01AEF68D560 for ; Mon, 27 May 2024 02:52:43 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3DB47C0002 for ; Sun, 26 May 2024 23:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1716767563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s1FN21pqsInNyls2oTtG/cDOoU0UXvemfd4Op5m2hlU=; b=mW6swurgewOk+TndV3dfOaoUqumXIPNmTZixnfFZbUYhL0E5SFw9uQ0FUeDjOi3eRZMxxH VUIJDNfVe0WKmOb8VaJge52yUssEkaO2pl/zoUqeLSdNd7+tygxSadXi/ivT63UD34OXNc 2qkN4gGdFrliLLk9OIVD4qj+gcykcViltVOHU7gi1NJdLlD4Yw6/cLXwQhvCS5SVl9HrkW nl/8mPHq6l5ODBHBwo9D1mszWulb+MZ0DYIpSm2XEB0F7Kcby0Z2JjJxEP358Q1By7iw6R jbi3x8QgR/UxMAMPi/zi0yBTLvDyHE2xbEFiTyL2ChHGiuNXaZLOxXKyXGwlAA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 May 2024 01:52:26 +0200 Message-ID: <20240526235230.2876318-14-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240526235230.2876318-1-michael@niedermayer.cc> References: <20240526235230.2876318-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 14/17] avdevice/dshow: Cleanup also on av_log case 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: u+rVHmnlX4cg Fixes: CID1598550 Resource leak Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavdevice/dshow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 557cf33161e..645c33ea2e6 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1001,7 +1001,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, " ch=%2u, bits=%2u, rate=%6lu\n", fx->nChannels, fx->wBitsPerSample, fx->nSamplesPerSec ); - continue; + goto next; } if ( (requested_sample_rate && requested_sample_rate != fx->nSamplesPerSec) ||