[FFmpeg-devel] [PATCH] configure: If vfwcap_indev disabled, don't do vfw32 checks; if enabled, require vfw32
Aaron Levinson
alevinsn at aracnet.com
Thu May 18 20:23:45 EEST 2017
On 5/18/2017 9:21 AM, Hendrik Leppkes wrote:
> On Thu, May 18, 2017 at 3:18 PM, Michael Niedermayer
> <michael at niedermayer.cc> wrote:
>> On Tue, May 16, 2017 at 03:38:32PM -0700, Aaron Levinson wrote:
>>> Signed-off-by: Aaron Levinson <alevinsn at aracnet.com>
>>> ---
>>> 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; }
>>>
>>
>> this breaks build on linux
>> ERROR: vfw32 not found
>>
>
> As discussed on IRC, other then the error on linux, overall I'm not
> sure what exactly this change improves? vfw detection seems to work
> just fine as is.
Agree--thanks for looking at this. Please disregard this patch--it is
incorrect in a couple of different ways.
Aaron Levinson
More information about the ffmpeg-devel
mailing list