virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit 'b9875b497a38f494acb599083b0d004545958697'

Browse Source 
* commit 'b9875b497a38f494acb599083b0d004545958697':
  configure: Remove unnecessary tests for d3d11va

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-03 18:41:02 +02:00
commit 5116381511
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -1857,8 +1857,6 @@ HAVE_LIST="
$TYPES_LIST $TYPES_LIST
atomics_native atomics_native
dos_paths dos_paths
d3d11_cobj
d3d11va_lib
dxva2api_cobj dxva2api_cobj
dxva2_lib dxva2_lib
libc_msvcrt libc_msvcrt
@ -5359,15 +5357,6 @@ enabled dxva2api_h &&
int main(void) { IDirectXVideoDecoder *o = NULL; IDirectXVideoDecoder_Release(o); return 0; } int main(void) { IDirectXVideoDecoder *o = NULL; IDirectXVideoDecoder_Release(o); return 0; }
EOF EOF
enabled d3d11_h &&
check_cc <<EOF && enable d3d11_cobj
#define _WIN32_WINNT 0x0600
#define COBJMACROS
#include <windows.h>
#include <d3d11.h>
int main(void) { ID3D11VideoDecoder *o = NULL; ID3D11VideoDecoder_Release(o); return 0; }
EOF
enabled vaapi && enabled vaapi &&
check_lib va/va.h vaInitialize -lva || check_lib va/va.h vaInitialize -lva ||
disable vaapi disable vaapi
@ -5625,10 +5614,6 @@ if test $target_os = "haiku"; then
disable posix_memalign disable posix_memalign
fi fi
enabled_all d3d11va d3d11_cobj CoTaskMemFree &&
prepend ffmpeg_libs $($ldflags_filter "-lole32") &&
enable d3d11va_lib
enabled_all dxva2 dxva2api_cobj CoTaskMemFree && enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") && prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") &&
enable dxva2_lib enable dxva2_lib