From f1248fae90b45501af4e8743d373e79191470331 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 22 Nov 2016 08:21:48 +0100 Subject: configure: Handle dxva2 optional components in the standard way --- configure | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure b/configure index d88329c71f..6feaa64d78 100755 --- a/configure +++ b/configure @@ -4518,7 +4518,6 @@ 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 @@ -4777,6 +4776,10 @@ if enabled libxcb; then add_extralibs "$xcb_shape_extralibs $xcb_shm_extralibs $xcb_xfixes_extralibs" fi +enabled dxva2 && + check_lib windows.h CoTaskMemFree -lole32 && + enable dxva2_lib + enabled vaapi && require vaapi va/va.h vaInitialize -lva enabled vaapi && @@ -5055,10 +5058,6 @@ check_deps $CONFIG_LIST \ $HAVE_LIST \ $ALL_COMPONENTS \ -enabled_all dxva2 CoTaskMemFree && - prepend avconv_extralibs $($ldflags_filter "-lole32") && - enable dxva2_lib - map 'enabled $v && intrinsics=${v#intrinsics_}' $INTRINSICS_LIST for thread in $THREADS_LIST; do -- cgit v1.2.3