From patchwork Sat Jan 1 16:39:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 32987 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14856455iog; Sat, 1 Jan 2022 08:41:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpN+nxmq31hRVVag2Nmo3aHxYlqL1aT5RQSkVPMMiliRr4d+CAoAfRoYP66noAeE5XitHZ X-Received: by 2002:a17:906:57c3:: with SMTP id u3mr31000255ejr.475.1641055270786; Sat, 01 Jan 2022 08:41:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055270; cv=none; d=google.com; s=arc-20160816; b=kzYdv0/08kZ8f+4gmDYTDZlOvxai7v6wLn6DUc6PmtefEOWnIiQtoPwTUAMKcsWKiO kqyZO5YYyUT2yknXynBkV1yI6tw6dXOWmK2SEg5kNvfd5VHg0+kIqGXJWZDE9DYQYLDv irz7+qjHNUPp9f42r1bhdjfDiI26MrLq1/9DFWwfKCa8F8sZlLX6tDZKG2JluST2O1Ko tx1bU+kY5CjyZLHqRU2Li31H1Yz1eJPPKXjXXYzqkB3jtkX9OMeulxgN8+88wUI5wL32 WJhg8OSvfakVrCtQsq3hJ/Z7qSOfZtCGctP+ZQzltf6CGLaJp3cvsUBVTNi/SBmtLbax Zi3A== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=+wLDTY6to8EW1VAdfYHiNjqK/BbCBhkDOaNkxM+iTIE=; b=kHNDitUcz36X1YnMChUUFNiFpcFwbJxQhrbCdmpbfu5QWYuDLq9alM99pNPu5K2Zk/ t4be+3dAb0ZoHvrSnqdg5MS5jy0gxLw9eusWAEl513aZdFQdHftRI5hAuuF7bWnbhNd8 TENdkSmHMXtagNrj4DzbINpcprnBL3atEkrxTcbkPL+yrryZVHjc40af+FwEjs9i90KC 8DgfbQ3inw9IurVR5SNsBzlbMQ9EqqSn51ZQ4Lg84u12ed0gOwFp0I9t7Ep1tyeOW0aq fBRA+yusZ9n5g25TENsOffmm4VddjUBT0Ft/62Mdsyj8Y6YlPhA2blrBwLoiteHKk/J2 RjkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="i/a3tYhs"; 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 qa11si15810151ejc.545.2022.01.01.08.41.10; Sat, 01 Jan 2022 08:41:10 -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=20210112 header.b="i/a3tYhs"; 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 75EDD68B0E9; Sat, 1 Jan 2022 18:41:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4644568B0EA for ; Sat, 1 Jan 2022 18:40:54 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id j6so118974178edw.12 for ; Sat, 01 Jan 2022 08:40:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CMENJXYLSIioiSUujXw4o0WZCC9rpxCgPy65ESvQpiU=; b=i/a3tYhsxCs7OrKK/aio/XfZc48SbfSvNjJ2RPo/jq66r95xGyxoJVnDviqAivws/T 8KKtjVSBdlyPxALnL9GPmqgJomCYYkADYxbTdYFAIRVMn9j6PNY45DaXKACpm642q64Z 8EGSca25Jcxxv2a9zEZtRYAeSwCETsSY+f+7EhMsSuvJyJZGhTo9DOHmPnCrODY8U5KD GD5/j2QUdBLByxvwUOKSLZkhl/jaNrvRsXWJzoT+pyzkMxb+BherHwfQ7sjwGW2qD1fk Xc4EgA8TcxTJqTxOHIC22muzCgRODpOsR4/32jh6adsfrogptdsyDQGNU8qgp/TzPE9g +Ewg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CMENJXYLSIioiSUujXw4o0WZCC9rpxCgPy65ESvQpiU=; b=sNbB5DebCqVLkNYTV+nGCXHYtQPAl00bOWffDq4wADCF1a4GAl8M0VCMjlu25F5p5k E9+p1ZqvZflMmagztnfDu3gA47TPW34iCJGQh76zX3KWCq6BUzcG5TsqhTuikp6PZAqD YM+Qx5/HbETTjnwZtWcviI4JH/WcXalDbWx0c9Hx3vPhhS15LVXjOfqIHEjqQzLK9yzR QznhslruR3RJO4t4Qj1NfGDJ/i11buBpMwytwbunMZeEE7yoVDEF+OffT8XYxIsV/Sbb D0JQnyhkXSr0fkavNb74vgv0GUXl5TS8ph7+pj7LvWDJMH/aSvbjrqQBh7vH+AER0ugs UvPA== X-Gm-Message-State: AOAM530NeZT1ekRvQ2xud1DutYLBxVs+cgAV8mb2ytFGEZeWw8s77lZ4 vC5ekop1v5A/wQ6U7QUk5cpVQnACrhyt4Q== X-Received: by 2002:a17:907:8a26:: with SMTP id sc38mr32247907ejc.557.1641055253517; Sat, 01 Jan 2022 08:40:53 -0800 (PST) Received: from localhost.localdomain (83-83-48-81.cable.dynamic.v4.ziggo.nl. [83.83.48.81]) by smtp.gmail.com with ESMTPSA id h10sm11713439edj.1.2022.01.01.08.40.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:40:53 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:39:56 +0100 Message-Id: <20220101163958.1147-3-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220101163958.1147-1-dcnieho@gmail.com> References: <20220101163958.1147-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avdevice/dshow: proper cleanup of queried media types 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8LjMeofSgfs5 Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 30f1be1ead..4b6887881d 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -953,7 +953,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, av_log(avctx, AV_LOG_INFO, "(%s)", chroma ? chroma : "unknown"); av_log(avctx, AV_LOG_INFO, "\n"); - continue; + goto next; } if (requested_video_codec_id != AV_CODEC_ID_RAWVIDEO) { if (requested_video_codec_id != fmt_info->codec_id) @@ -1038,6 +1038,7 @@ next: if (type && type->pbFormat) CoTaskMemFree(type->pbFormat); CoTaskMemFree(type); + type = NULL; } // previously found a matching VIDEOINFOHEADER format and stored // it for safe keeping. Searching further for a matching