From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 95CAE40F8C for ; Sun, 2 Jan 2022 09:50:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3445268B13F; Sun, 2 Jan 2022 11:50:36 +0200 (EET) 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-Google-Smtp-Source: ABdhPJzFg392Svv0WbOJ2YIuUoxI10KPsR3CSAIVrq+hwL8gArf9Bq8Zt0s0IdUoEBydDoeSVRRPuw== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; } -- 2.28.0.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".