diff options
| author | Clément Bœsch <u@pkh.me> | 2017-04-17 13:42:33 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-04-17 13:42:33 +0200 |
| commit | d1c8b9660848589ce4f1ac6e8ab337d9de495fbc (patch) | |
| tree | c6580a5741c41ebafaa867e4b3b565f2b0ed69cb /configure | |
| parent | 99b35a51ccbe2fc98530e5cf7529e7d377e1165e (diff) | |
| parent | f1248fae90b45501af4e8743d373e79191470331 (diff) | |
| download | ffmpeg-d1c8b9660848589ce4f1ac6e8ab337d9de495fbc.tar.gz | |
Merge commit 'f1248fae90b45501af4e8743d373e79191470331'
* commit 'f1248fae90b45501af4e8743d373e79191470331':
configure: Handle dxva2 optional components in the standard way
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -5587,7 +5587,6 @@ check_func_headers lzo/lzo1x.h lzo1x_999_compress check_func_headers stdlib.h getenv check_func_headers sys/stat.h lstat -check_func_headers windows.h CoTaskMemFree -lole32 check_func_headers windows.h GetProcessAffinityMask check_func_headers windows.h GetProcessTimes check_func_headers windows.h GetSystemTimeAsFileTime @@ -6031,6 +6030,10 @@ enabled dxva2api_h && int main(void) { IDirectXVideoDecoder *o = NULL; IDirectXVideoDecoder_Release(o); return 0; } EOF +enabled dxva2 && + check_lib windows.h CoTaskMemFree -lole32 && + enable dxva2_lib + enabled vaapi && check_lib va/va.h vaInitialize -lva || disable vaapi @@ -6371,10 +6374,6 @@ if test $target_os = "haiku"; then disable posix_memalign fi -enabled_all dxva2 dxva2api_cobj CoTaskMemFree && - prepend ffmpeg_extralibs $($ldflags_filter "-lole32") && - enable dxva2_lib - # add_dep lib dep # -> enable ${lib}_deps_${dep} # -> add $dep to ${lib}_deps only once |