From patchwork Sat Jan 1 16:39:57 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: 32988 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14856574iog; Sat, 1 Jan 2022 08:41:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXnS1JCdl+s/pddOElZMpgWGmfIcbpIlcUQWf9VDFzh5BugJfSLsXvfUVu1ReAH2swW3BH X-Received: by 2002:a17:907:160e:: with SMTP id hb14mr31306354ejc.328.1641055281504; Sat, 01 Jan 2022 08:41:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641055281; cv=none; d=google.com; s=arc-20160816; b=A0UL0MrnuR+DCKI1Iw7ZeE5hqqqN3YHnswl6KToanxIohC9cnUiG1ij/lqI1ac7/Id 5AxJr5ye2IhYXi2Xe3eQyLuQtLyx/vN/f82B6s/f4yrpOMMYfGiDKEL12VF/ZbaBWd2D mbx8RUKYLD5gnMd9adCqpE7xIwNiIfK41SEhIms1EypX9voJBwFlQn/IANjRCJdBjaPP Mx6Nl2h2nf7FbR1WKykus16CwyBLzBz0y6zTjJIrfwxGpYswuCuhapuKiaoXb8wIEbE9 MqKSJRgQF+b+/FRwSF6ps7Eg6md6aUXziJEvQ/ur1JVsXAKeNTBUVIAtMBYWvA0XzxBr /HBQ== 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=qGWl1X+9zJZQpjwMyBNobnZC8+SSzzIWQqzHt61Oq8U=; b=jG5ngU/2Zj3ok0WePtXDp4v4SsHeCr6GgH8N5oh8V6pO/n0Y8t/0bJ29M7Ik6IxjgN 0i7g1RksrLt7wM5t5gI+9JpNf+pljbKERpCr4UVGeDBRHjX1c1LW7WPbN783hCh5ls/Q xmGAgNeqJFuYByoPzlSTwX7INaTWEAlFnl6kbrCErCOE9VpvHIkAfp1AL/QMbNLEcteP jjx1XtsRZ2T4Etpc3lgfPrXx3Fr+daJwkWSXV139DARDr8CB7/1XTr2JX9ItFn5WXHZ1 tJYwiYR6Ukyvwga9I1tyYiWxRmAo0rYvzND1XH/qiHL1QFBWESUWLH/W0DO29Olw4KnT jJWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="n/8O2+yS"; 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 a20si14933986edb.545.2022.01.01.08.41.20; Sat, 01 Jan 2022 08:41:21 -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="n/8O2+yS"; 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 9237568B106; Sat, 1 Jan 2022 18:41:06 +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 760F568B0FC for ; Sat, 1 Jan 2022 18:41:00 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id m21so120328228edc.0 for ; Sat, 01 Jan 2022 08:41:00 -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=yRSAwDBI1mdyzGxO/PSAk3hkVUPHGvRCz5gtFA+pM5g=; b=n/8O2+ySrRAl8gR432xiOzNVjcN2pkEMY71PeGodlp0Ruv88sUql60aaD8MqVHSGO4 8VNm7wfdj+Be1D9Kn6LESQOz2Vh6ToWZhXzkENFR70CxvtX1OIC2yFVybDqtmozA82NU RGg9nG+btaBGuztZsyuGsgEwD12S+vN+6hPgKM5JTJU5kqXNDyWMQvsgXPrR5MbbpVYa LHOZaAyzvVPcEuHL1rv2hGzrq+axAC/8lb/HNRqKnIJHgOIdLKN2uyt3fkImH9LmRW6G YmNPCwk18on6F4Sc3EXbXFDMvI8OHfzgXI3RWbMhuri6IYfVTNIEBRoLMtXRSflfCREm 8JwA== 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=yRSAwDBI1mdyzGxO/PSAk3hkVUPHGvRCz5gtFA+pM5g=; b=MyZEdvbEWtSTjwOaKo4z9jSkq6XYwqUZsuaDqlGjPm62u/TgQXCUth1k0pjA5daVpk 8VEy8uvHCGi5GYHy6an2H2stNM8lq0EfFcvCiNCmIEhkOcpF+i7gmxHSObStisE3KpGu NmdN1vGkCbTn+Tt5qXjkhodr7iRV1QNd5WGN4ttzwTFM29ngegYuYwfCEBclFyTz2CrO YkPhfHTmV6f9hZO101xd451BIjzHkOJ7pIFzGK3rPA0GMLQNTkNkL9nSCxw3tKNQriBf 1WLs6pq4WgpG5FG5g56Um9/YFj7NBa0fO3Y+tXzQiCNDvMpYT6dWW2FKCy10pvjTBRnX OkfQ== X-Gm-Message-State: AOAM533XSaV3IjHDUYc6JyKhNAUoXp6+aYp8NMUTvxqcjHoaZkoMknbN 1M6qOmUIYN9PpdbiHWYKvI+Ct7h0Jgtk9w== X-Received: by 2002:aa7:c319:: with SMTP id l25mr38171439edq.91.1641055259889; Sat, 01 Jan 2022 08:40:59 -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 u16sm11703793edr.43.2022.01.01.08.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jan 2022 08:40:59 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jan 2022 17:39:57 +0100 Message-Id: <20220101163958.1147-4-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 3/4] avdevice/dshow: only set pin format if wanted 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: byWkP6+90qN0 Signed-off-by: Diederick Niehorster --- libavdevice/dshow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 4b6887881d..f2d95fa470 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -1046,7 +1046,7 @@ next: // format based on the VIDEOINFOHEADER format. // NB: this never applies to an audio format because // previous_match_type always NULL in that case - if (!format_set && previous_match_type) { + if (pformat_set && !format_set && previous_match_type) { if (IAMStreamConfig_SetFormat(config, previous_match_type) == S_OK) format_set = 1; }