From patchwork Sun Jan 2 09:49:39 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: 33008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15299920iog; Sun, 2 Jan 2022 01:50:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0IOGsj8TiOQ9ym1zPTvBVYOnuadOeGKRI9hgqmUhKAomVc62CsCvzLvuRCeveTrcGtVJR X-Received: by 2002:a17:907:6095:: with SMTP id ht21mr32064859ejc.67.1641117058521; Sun, 02 Jan 2022 01:50:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641117058; cv=none; d=google.com; s=arc-20160816; b=FuafwKZzlwG8878GjVQGfltcTqM2L3lo0NpvHckmS5UZNK9TPRQkXQDRTVWSj0sBMX VOpbdBacTqvjPp7e03hJbaI/i/5QS8e0/M1KOFdEzS9VKMFeeSrDWXAIZp/yVCGWu6rX JROXJULStAd9x0qI5NBMX6XM/SlErtnQIcqqqMnpT4pmJLpfp9dnimGaHUqO0SuAJh6n bj5skenTL/MXkRx1E+QbPtP3gWYl5/NKQrRh47bLU82Kl61ZZX157DZ5LjNo+Qc8ul6h MTy1S/cMhG1kYH0iLGskNbKE6fO5QITuFK2gO/VHopLSALTCDoTlEsJ4rTc3WUd4WV/i SIJA== 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=jf8yM3lDmJ64bfTnhSdHcxxgz0NmsZdAa355ESefSLktdxRqVV9fkHIQ+v0VnPP6Zq l/kyx+dkNiD9gC+NLJ3VHXr7OcL097ZsRwsJy+8isVulPldxW8eIQxE2BJVyjU5Y8dEr bCHLRe6Rt5BugLpNPM6CDXzAYcVRDwEZX1KVpg+ribN972o1X8JeJodMkuAWYY4d92r5 wNOuQWNUx45HTPj9XbdQOdAdHUoL/1y87L9HcpzmpzA48rnQPphPXe5gIU3YAF+JBv3P vVsghKMbyBwFKdailQrohw61st1SCgz8Ef5herQe3Jj5qB4EEvus30PuZdiOzDB9Z2SH w4aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CeCcNY5q; 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 dt6si19103668ejc.197.2022.01.02.01.50.58; Sun, 02 Jan 2022 01:50:58 -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=CeCcNY5q; 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 7820168B168; Sun, 2 Jan 2022 11:50:36 +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 BE7DC68B15F for ; Sun, 2 Jan 2022 11:50:29 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id n30so12784438eda.13 for ; Sun, 02 Jan 2022 01:50:29 -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=nLmnuBu/QIEZtpOo2g2HeJb9Y1RvoRXXpKjYrAjiask=; b=CeCcNY5qIrR1DRqcnO/NrV4sGIcRG7nZI4WfUUdtTmFFq2pY2HQJwzRZauZlzoH5SM eMUxBs4vLqMM7Cb7i03KieDyKaX/iiqaoYcYGg37nBGHO/SOTe2JYNwuoVXqCh+LLcfv 0H+P2fFiOzdCoAAUPEfksawOHT+ZvcaKThZOZ+6fE3zAqK73mWlOe0fmf1baX2oso383 FVzGXhI4OXxEousNW8ObemhswyEI6siBK51YaK8cHcP2XUEOz3DvZMI3H5LqvJcEBEnD BF6uWFFoRt8N6TQ0JoARgyQctkjfVRhtJqzYZzogPoankovlJI77TZJA40KmYmjdgM0c 00Xg== 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=nLmnuBu/QIEZtpOo2g2HeJb9Y1RvoRXXpKjYrAjiask=; b=xxzWwaJPZIAZXjQOHHbkBo4FP+sb55auWZfb+WkPBKmrJ4Bz0hAxmdjFMW4LLMmKN8 WQW6P7JTsFH4RjWilqdehHWKFalr/xpk7vdSQpGf/kailQ3JHKBWLymTT7CATWA9FP/q J9JEAek2Y6evedD45/wp4c/1tsZXzXu+7zGQX6468e5rYoIl1FB3rDAZtfd7ghngk0oX T2qZjqGphqTvHkP6xyLes0AcyI6V3WDZzqiWAlgYiQNgViBjqTX9S3GS4/hMHPAHel9p HjdluyWgDuToEVY1L2KQiMmpcxdTW22BrynHmt4MPgrUoXofpWzxKWzQMMBTvMpccxAb 9R1g== X-Gm-Message-State: AOAM533LB+Y05wKQX0GBfMI/uMUE4TmD1tYgJyqvBFavam7E14/1K5BZ NYvj1DOeVK1mO4ynd1tDtRKHl0F/TIHIuQ== X-Received: by 2002:a17:906:3b52:: with SMTP id h18mr33756891ejf.287.1641117029141; Sun, 02 Jan 2022 01:50:29 -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 ga36sm9702386ejc.200.2022.01.02.01.50.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jan 2022 01:50:28 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Jan 2022 10:49:39 +0100 Message-Id: <20220102094940.1765-5-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 4/5] 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: kVc8iuCZZeaT 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; }