diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 18:41:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-03 18:41:02 +0200 |
| commit | 511638151102462627ad54e3dffb9aa9cc9afe5e (patch) | |
| tree | b7724dc88797d64d21ef92660d6c5ca0116bbf47 | |
| parent | c08a64bb2b12a48ce0e6ef41c0962774f599253e (diff) | |
| parent | b9875b497a38f494acb599083b0d004545958697 (diff) | |
| download | ffmpeg-511638151102462627ad54e3dffb9aa9cc9afe5e.tar.gz | |
Merge commit 'b9875b497a38f494acb599083b0d004545958697'
* commit 'b9875b497a38f494acb599083b0d004545958697':
configure: Remove unnecessary tests for d3d11va
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -1857,8 +1857,6 @@ HAVE_LIST=" $TYPES_LIST atomics_native dos_paths - d3d11_cobj - d3d11va_lib dxva2api_cobj dxva2_lib libc_msvcrt @@ -5359,15 +5357,6 @@ enabled dxva2api_h && int main(void) { IDirectXVideoDecoder *o = NULL; IDirectXVideoDecoder_Release(o); return 0; } 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 && check_lib va/va.h vaInitialize -lva || disable vaapi @@ -5625,10 +5614,6 @@ if test $target_os = "haiku"; then disable posix_memalign fi -enabled_all d3d11va d3d11_cobj CoTaskMemFree && - prepend ffmpeg_libs $($ldflags_filter "-lole32") && - enable d3d11va_lib - enabled_all dxva2 dxva2api_cobj CoTaskMemFree && prepend ffmpeg_libs $($ldflags_filter "-lole32" "-luser32") && enable dxva2_lib |