[FFmpeg-cvslog] configure: Disentangle vfw32 and user32 lib handling
Diego Biurrun
git at videolan.org
Wed Apr 26 17:42:29 EEST 2017
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Dec 15 18:59:46 2016 +0100| [1faffe7e8fab21186a233011bc8a62f47962e2cd] | committer: Diego Biurrun
configure: Disentangle vfw32 and user32 lib handling
Check for and link against user32 instead, which also fixes
the missing dependency of dxva2 on user32 with MSVC.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1faffe7e8fab21186a233011bc8a62f47962e2cd
---
configure | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 2ecd0ed718..19dbdf2b79 100755
--- a/configure
+++ b/configure
@@ -2387,7 +2387,6 @@ sndio_indev_deps="sndio"
sndio_outdev_deps="sndio"
v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
-vfwcap_indev_extralibs="-lavicap32"
xcbgrab_indev_deps="libxcb"
# protocols
@@ -3046,7 +3045,6 @@ msvc_common_flags(){
-mthumb) ;;
-march=*) ;;
-lz) echo zlib.lib ;;
- -lavicap32) echo vfw32.lib user32.lib ;;
-lx264) echo libx264.lib ;;
-l*) echo ${flag#-l}.lib ;;
-L*) echo -libpath:${flag#-L} ;;
@@ -4729,7 +4727,8 @@ check_header AVFoundation/AVFoundation.h
check_header sys/videoio.h
-check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs"
+check_lib "windows.h winuser.h" GetShellWindow -luser32
+check_lib "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
More information about the ffmpeg-cvslog
mailing list