[FFmpeg-devel] [PATCH] configure: If vfwcap_indev disabled, don't do vfw32 checks; if enabled, require vfw32

[Aaron Levinson]

On 5/16/2017 4:23 PM, Steven Liu wrote:
> 2017-05-17 6:38 GMT+08:00 Aaron Levinson <alevinsn at aracnet.com>:
>
>> 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; }
>>
>
> indent problem?

It's not--it is aligned with "require" on the earlier line, and that 
alignment is consistent with similar things in other parts of the file. 
I decided to leave the comment alone though, but I could indent the 
comment with the other lines if that makes more sense.

Aaron