ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 13:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f1248fae90b45501af4e8743d373e79191470331'

Browse Source 
* commit 'f1248fae90b45501af4e8743d373e79191470331':
  configure: Handle dxva2 optional components in the standard way

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-04-17 13:42:33 +02:00
commit d1c8b96608
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -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