diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-04-28 23:00:38 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-04-28 23:02:56 +0200 |
| commit | a61c2115fb936d50b8b0328d00562fe529a7c46a (patch) | |
| tree | 8de5d3e343e2806e56b7e5297a9198cfa96dc3aa | |
| parent | 35177ba77ff60a8b8839783f57e44bcc4214507a (diff) | |
| download | ffmpeg-a61c2115fb936d50b8b0328d00562fe529a7c46a.tar.gz | |
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.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | avconv_opt.c | 2 | ||||
| -rwxr-xr-x | configure | 10 |
3 files changed, 9 insertions, 5 deletions
@@ -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 6015183a3f..ae6c48b39d 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 }, @@ -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 |