From patchwork Sun Jan 2 09:49:37 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: 33006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15299791iog; Sun, 2 Jan 2022 01:50:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmPqeRoS8p9p6OlRUVbYCZ9cM315ipC03+ce13Wfm0omvIe37FmCbzc3yNpI1AG8/RAhGS X-Received: by 2002:a17:906:5f97:: with SMTP id a23mr13497421eju.154.1641117037343; Sun, 02 Jan 2022 01:50:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641117037; cv=none; d=google.com; s=arc-20160816; b=wXxgWkIOXX1tKSeeydTD1G5f7uRcIHv+3fsmWPeUNc+t+JTmEFpSDx6c2qSikphBH0 lzRzCFYpsKqPPY3NdmBMmytnF6/MgRMYiDDxzJDzKmFAZgkKtrK8oT98MUQAyDpf+7D+ 4pB9ohtQ+VVkwqO2gwH2f0URb8SslUPLblC/s0aXucbJm2UuqSATduUuFt2X/pO12f7o 8VGDL0iqXHp/YD8nxegtvwOBerw4MsBrWbOQzzVzoq1+oPzchqfT6iyVsP2GXdPxLNyf L82QVXOWd2FCRIyUUOSLF0We8THu8lTRDeEQ7p3xvxeaax8NDYEPu9w7GBsBXw4MX56c jenA== 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=CGaRJfZL4Dbx6qmsAUYkqqoNRhMUZWcaWhzHmrMaEtOYlFQSL7ovohzL6hcUEDL6hQ fp2ZwHHWy8/hrOupxDL72DkSxBqZtSsDFFQqRnC+qLqkBnpBefqrhWbYDcvpWyayS0Xf pwOIVogl/yc+p0lTdUfGjY5AxsQPZiPXiBgSyun3riJqM0R+d2YQAhFO+l6RDoYsyLA7 5qGP3tgKvwF6kZHl7sARNYKcbvSrzOlDDZirfmitNS0ujRF5Fr+jOeyWK6A/pLgi6bLD Fwq6d5Yw+0+4P1CkAtMuUQuk8NIObQg7Rc/4JXio+CuCRIpwISrbQZVzcSA4wOmj7JZ0 Ys0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RpkUFZFj; 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 lc12si13548604ejb.240.2022.01.02.01.50.37; Sun, 02 Jan 2022 01:50:37 -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=RpkUFZFj; 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 32FBF68B15B; Sun, 2 Jan 2022 11:50:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB5D668B13C for ; Sun, 2 Jan 2022 11:50:16 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id q14so117082461edi.3 for ; Sun, 02 Jan 2022 01:50:16 -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=X6CgmnL2gC+8hm20Ub7tdd22ne8Uk1aUOuMPqgkcoDw=; b=RpkUFZFjSvVTzHvGZSJ/j561ASR24z7TXkg73ThEsgo9JzKQ4Bqxv9iit2bUT4ymOd s2h5Ix6kdWKrAwfGyNhqtCN4FF41qSWHgp2/xyyvsd4FMj2DY8shtkqrz8uEWvnl3GY0 ozGF/Z6v6aFB8KeTojmWetM9BiHMeJegOQYpd8ZG1FsWjZEJGljtRGoZkW8mrRZm/FW3 jodccfSxd4639tEA6OIqwCnHgOmuFNCkAQT+eodKfMkpK5obeRwny5PdcnDs0GAs8jrN J6GPFKFnBPhbYc1G6qaUUjBrxbpSfqOMdnwsXvuAdo3i16wBHe4JEeoLDLLLZbxMc7nG lUgw== 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=X6CgmnL2gC+8hm20Ub7tdd22ne8Uk1aUOuMPqgkcoDw=; b=PkefKBVg3d0DtgapatbnWLvboJ8VviPgiVNr73iTF0NjfqW3Cinh782B9XJq63jIMz /g3mckLM06fCkU8NyMYan4q053rSn8UY2O6xxmr+Vr964AD3mqLLJIBz37qYh/MvfJAA tFaT/1KLYGunQCGigWQ9CrxpJRMrzWpSfzdqCX66ZrE7lll2yykdffEM7G2FoqMjEDi/ 7MAHXXE/HQSM44jcJbM82aoOXOA5AJYj/N1648jYnCh426yDTjLTJUGD2Lvp+QO4lMJD kFt0pWW8rDQC6yDX2R143PXStP+/NbciYYUNx25ADOpTGn5DwcYkux2J76eqh6D7bcMw tNRg== X-Gm-Message-State: AOAM532u39mZU6SuY9hmr4YWVeB6DAKFtes15wqGtsXYHbeH9J7wZYM3 A9DPlCZ4ga6j5f6OmRJeQ1OjXc3S8yGZTQ== X-Received: by 2002:a05:6402:2693:: with SMTP id w19mr40826155edd.63.1641117016259; Sun, 02 Jan 2022 01:50:16 -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 ck14sm12417457edb.5.2022.01.02.01.50.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jan 2022 01:50:15 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jan 2022 10:49:37 +0100 Message-Id: <20220102094940.1765-3-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20220102094940.1765-1-dcnieho@gmail.com> References: <20220102094940.1765-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/5] 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: XUESd3LKLbjz 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