virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

configure: rework dxva in avconv handling

Browse Source 
Move the dxva check after the dependencies have been detected, make sure
the ole32 library exists.

Fixes build on non-Windows.
This commit is contained in:
Anton Khirnov 2014-04-28 23:00:38 +02:00
parent 35177ba77f
commit a61c2115fb
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -75,7 +75,7 @@ $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
OBJS-avconv += avconv_opt.o avconv_filter.o OBJS-avconv += avconv_opt.o avconv_filter.o
OBJS-avconv-$(HAVE_VDPAU_X11) += avconv_vdpau.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 TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options

2
avconv_opt.c
View File

@ -57,7 +57,7 @@ const HWAccel hwaccels[] = {
#if HAVE_VDPAU_X11 #if HAVE_VDPAU_X11
{ "vdpau", vdpau_init, HWACCEL_VDPAU, AV_PIX_FMT_VDPAU }, { "vdpau", vdpau_init, HWACCEL_VDPAU, AV_PIX_FMT_VDPAU },
#endif #endif
#if CONFIG_DXVA2 #if HAVE_DXVA2_LIB
{ "dxva2", dxva2_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD }, { "dxva2", dxva2_init, HWACCEL_DXVA2, AV_PIX_FMT_DXVA2_VLD },
#endif #endif
{ 0 }, { 0 },

10
configure vendored
View File

@ -1414,6 +1414,7 @@ SYSTEM_FUNCS="
aligned_malloc aligned_malloc
closesocket closesocket
CommandLineToArgvW CommandLineToArgvW
CoTaskMemFree
CryptGenRandom CryptGenRandom
dlopen dlopen
fcntl fcntl
@ -1502,6 +1503,7 @@ HAVE_LIST="
$TYPES_LIST $TYPES_LIST
atomics_native atomics_native
dos_paths dos_paths
dxva2_lib
libc_msvcrt libc_msvcrt
libdc1394_1 libdc1394_1
libdc1394_2 libdc1394_2
@ -3945,6 +3947,7 @@ check_func usleep
check_func_headers io.h setmode check_func_headers io.h setmode
check_func_headers stdlib.h getenv check_func_headers stdlib.h getenv
check_func_headers windows.h CoTaskMemFree -lole32
check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessAffinityMask
check_func_headers windows.h GetProcessTimes check_func_headers windows.h GetProcessTimes
check_func_headers windows.h GetSystemTimeAsFileTime check_func_headers windows.h GetSystemTimeAsFileTime
@ -4146,9 +4149,6 @@ enabled vdpau && enabled xlib &&
prepend avconv_libs $($ldflags_filter "-lvdpau") && prepend avconv_libs $($ldflags_filter "-lvdpau") &&
enable vdpau_x11 enable vdpau_x11
enabled dxva2 &&
prepend avconv_libs $($ldflags_filter "-lole32")
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel" enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
# add some useful compiler flags if supported # add some useful compiler flags if supported
@ -4352,6 +4352,10 @@ check_deps $CONFIG_LIST \
$HAVE_LIST \ $HAVE_LIST \
$ALL_COMPONENTS \ $ALL_COMPONENTS \
enabled_all dxva2 CoTaskMemFree &&
prepend avconv_libs $($ldflags_filter "-lole32") &&
enable dxva2_lib
! enabled_any memalign posix_memalign aligned_malloc && ! enabled_any memalign posix_memalign aligned_malloc &&
enabled_any $need_memalign && enable memalign_hack enabled_any $need_memalign && enable memalign_hack