[SCM] libav/experimental: configure: rework dxva in avconv handling

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a61c2115fb936d50b8b0328d00562fe529a7c46a
Author: Anton Khirnov <anton at khirnov.net>
Date:   Mon Apr 28 23:00:38 2014 +0200

    configure: rework dxva in avconv handling
    
    Move the dxva check after the dependencies have been detected, make sure
    the ole32 library exists.
    
    Fixes build on non-Windows.

diff --git a/Makefile b/Makefile
index 2d9dcd7..c34320b 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
 
 OBJS-avconv                   += avconv_opt.o avconv_filter.o
 OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.o
-OBJS-avconv-$(CONFIG_DXVA2)   += avconv_dxva2.o
+OBJS-avconv-$(HAVE_DXVA2_LIB) += avconv_dxva2.o
 
 TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
 HOSTPROGS  := $(TESTTOOLS:%=tests/%) doc/print_options
diff --git a/avconv_opt.c b/avconv_opt.c
index 6015183..ae6c48b 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -57,7 +57,7 @@ const HWAccel hwaccels[] = {
 #if HAVE_VDPAU_X11
     { "vdpau", vdpau_init, HWACCEL_VDPAU, AV_PIX_FMT_VDPAU },
 #endif
-#if CONFIG_DXVA2
+#if HAVE_DXVA2_LIB
     { "dxva2", dxva2_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD },
 #endif
     { 0 },
diff --git a/configure b/configure
index 7d6f272..30f90eb 100755
--- a/configure
+++ b/configure
@@ -1414,6 +1414,7 @@ SYSTEM_FUNCS="
     aligned_malloc
     closesocket
     CommandLineToArgvW
+    CoTaskMemFree
     CryptGenRandom
     dlopen
     fcntl
@@ -1502,6 +1503,7 @@ HAVE_LIST="
     $TYPES_LIST
     atomics_native
     dos_paths
+    dxva2_lib
     libc_msvcrt
     libdc1394_1
     libdc1394_2
@@ -3945,6 +3947,7 @@ check_func  usleep
 check_func_headers io.h setmode
 check_func_headers stdlib.h getenv
 
+check_func_headers windows.h CoTaskMemFree -lole32
 check_func_headers windows.h GetProcessAffinityMask
 check_func_headers windows.h GetProcessTimes
 check_func_headers windows.h GetSystemTimeAsFileTime
@@ -4146,9 +4149,6 @@ enabled vdpau && enabled xlib &&
     prepend avconv_libs $($ldflags_filter "-lvdpau") &&
     enable vdpau_x11
 
-enabled dxva2 &&
-    prepend avconv_libs $($ldflags_filter "-lole32")
-
 enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
 
 # add some useful compiler flags if supported
@@ -4352,6 +4352,10 @@ check_deps $CONFIG_LIST       \
            $HAVE_LIST         \
            $ALL_COMPONENTS    \
 
+enabled_all dxva2 CoTaskMemFree &&
+    prepend avconv_libs $($ldflags_filter "-lole32") &&
+    enable dxva2_lib
+
 ! enabled_any memalign posix_memalign aligned_malloc &&
     enabled_any $need_memalign && enable memalign_hack
 

-- 
Libav/FFmpeg packaging