On Tue, Nov 29, 2016 at 7:34 PM, Diego Biurrun <di...@biurrun.de> wrote:
> ---
> configure | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 18cec1a..74d89e2 100755
> --- a/configure
> +++ b/configure
> @@ -2382,7 +2382,6 @@ sndio_indev_deps="sndio_h"
> sndio_outdev_deps="sndio_h"
> 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
> @@ -3041,7 +3040,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} ;;
> @@ -4752,7 +4750,7 @@ 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 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
> @@ -4804,6 +4802,10 @@ if enabled libxcb; then
> fi
>
> enabled dxva2 &&
> + check_lib "windows.h winuser.h" GetShellWindow -luser32 ||
> + disable dxva2
> +
> +enabled dxva2 &&
> check_lib windows.h CoTaskMemFree -lole32 &&
> enable dxva2_lib
>
This entirely takes out linking against avicap32, and replaces it with
vfw32, presumably this was once required (except for msvc). That does
introduce a distinct change in linking, so it would need testing on
all supported versions of mingw.
Also does vfwcap indev not require user32 anymore, like it apparently used to?
- Hendrik
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
