From patchwork Tue May 16 22:38:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Levinson X-Patchwork-Id: 3683 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp668829vsk; Tue, 16 May 2017 15:38:45 -0700 (PDT) X-Received: by 10.223.173.131 with SMTP id w3mr122894wrc.125.1494974325079; Tue, 16 May 2017 15:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494974325; cv=none; d=google.com; s=arc-20160816; b=zRaI52i+HUwQ7LYKdGjHXu4XAXk6Z/gk5pHerJuhaHnYEJ1giyZSWCstJWc5U81p6g VpsjkiP6e1Q60PT3Mzc0YDKsomm6x6RqTMKMemJ5MuYm25+K9+UKwoYbQIKp2ttAh9eB gpe7FWgRLsT0JjAB3SXd9bef2LckilwEBhxNrwCOyyW2fXKNJgTnDsVLyv7vu/KXNTDS ZG5EriMBBYd8XffeXa2eWFDeZFcctYkvDFMo/3CvgkFOEFOLLPXk42/DpQLj7hZ4fgrH jSUb9/odHYpvdxwxZQQ5RPKZat4lb/mKLype7EChXjDetEhWW4YVMIO/NMgZAPuM2Wwl oxxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:user-agent:date:message-id:from:to :delivered-to:arc-authentication-results; bh=Ear/jdpa6RROBNGOEI/b//O/ktabuks+Xm5susKURXI=; b=Zwof4xl6V6pkF8yfIRbfCeqN/9GpLjCgTxWSFp3HcBM5yge9ahfC4s2nQDgKx5Cr9U vaEDJvmrtQEpDcqxpwXKT6Xh6VA6vhOPFyFtJovl5e2gbq5jYnzqHp/jhxWuK8s05ird EM0D8rESSajtUoN1Dameo0TeLtvEyFUqiSCKVbGPUeRA/j+7afv+YE1NLJ4mqHX/PWLf wfzZo0/CNXEAElzzKpkPKa2MGJDaBGy/lfVSIqdj3FHxxPZx6FajF+2V8rhqI1fdtNwr wz7gMDwclRBTcW4poEHPqwW/6cdfqj02NauxAEMnU9rwEehfDspkRR/RDIoLhq9fC4Si fYhw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h3si555878wmd.152.2017.05.16.15.38.44; Tue, 16 May 2017 15:38:45 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C2FD6882FD; Wed, 17 May 2017 01:38:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from white.spiritone.com (white.spiritone.com [216.99.193.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E614B6806C4 for ; Wed, 17 May 2017 01:38:35 +0300 (EEST) Received: from [192.168.3.101] (184-100-204-251.ptld.qwest.net [184.100.204.251]) by white.spiritone.com (Postfix) with ESMTPSA id 0958C7340636 for ; Tue, 16 May 2017 15:38:34 -0700 (PDT) To: FFmpeg development discussions and patches From: Aaron Levinson Message-ID: <04b6a4eb-e236-c272-e029-4941046a9be2@aracnet.com> Date: Tue, 16 May 2017 15:38:32 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: If vfwcap_indev disabled, don't do vfw32 checks; if enabled, require vfw32 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Aaron Levinson --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7980d92..49f91ac 100755 --- a/configure +++ b/configure @@ -6013,10 +6013,10 @@ check_header sys/videoio.h check_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_safe struct_v4l2_frmivalenum_discrete check_lib user32 "windows.h winuser.h" GetShellWindow -luser32 -check_lib vfw32 "windows.h vfw.h" capCreateCaptureWindow -lvfw32 +disabled vfwcap_indev || { require vfw32 "windows.h vfw.h" capCreateCaptureWindow -lvfw32 && # check that WM_CAP_DRIVER_CONNECT is defined to the proper value # w32api 3.12 had it defined wrong -check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_defines + check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_defines; } check_type "dshow.h" IBaseFilter