Commit 51163815 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b9875b49'

* commit 'b9875b49':
  configure: Remove unnecessary tests for d3d11va

Conflicts:
	configure
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c08a64bb b9875b49
...@@ -1857,8 +1857,6 @@ HAVE_LIST=" ...@@ -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 && ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment