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

Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

Browse Source 
* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
  configure: rework dxva in avconv handling

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-29 01:32:04 +02:00
commit 21c7e99659
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -30,7 +30,7 @@ $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_o
OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o
OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
OBJS-ffmpeg-$(CONFIG_DXVA2) += ffmpeg_dxva2.o OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options

11
configure vendored
View File

@ -1659,6 +1659,7 @@ SYSTEM_FUNCS="
clock_gettime clock_gettime
closesocket closesocket
CommandLineToArgvW CommandLineToArgvW
CoTaskMemFree
CryptGenRandom CryptGenRandom
dlopen dlopen
fcntl fcntl
@ -1759,6 +1760,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
@ -4501,6 +4503,7 @@ check_func_headers io.h setmode
check_func_headers lzo/lzo1x.h lzo1x_999_compress check_func_headers lzo/lzo1x.h lzo1x_999_compress
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
@ -4800,10 +4803,6 @@ enabled vdpau && enabled xlib &&
prepend ffmpeg_libs $($ldflags_filter "-lvdpau") && prepend ffmpeg_libs $($ldflags_filter "-lvdpau") &&
enable vdpau_x11 enable vdpau_x11
enabled dxva2 &&
check_header dxva2api.h -D_WIN32_WINNT=0x0600 &&
prepend ffmpeg_libs $($ldflags_filter "-lole32")
# Funny iconv installations are not unusual, so check it after all flags have been set # Funny iconv installations are not unusual, so check it after all flags have been set
disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv disabled iconv || check_func_headers iconv.h iconv || check_lib2 iconv.h iconv -liconv || disable iconv
@ -5033,6 +5032,10 @@ if test $target_os = "haiku"; then
disable posix_memalign disable posix_memalign
fi fi
enabled_all dxva2 CoTaskMemFree &&
prepend ffmpeg_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

2
ffmpeg_opt.c
View File

@ -67,7 +67,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 },