diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:05:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:05:45 -0300 |
| commit | 084e7fbe49fb0935b733726c2b0f7e6ce9553874 (patch) | |
| tree | 7952354e948c4ae1456f3338798782d7d57db1de | |
| parent | 1409c2b7baa92ee1db211ce7a643907d9cbd7187 (diff) | |
| parent | e7168d4c0cb279cf267690549ca92ad564572bc6 (diff) | |
| download | ffmpeg-084e7fbe49fb0935b733726c2b0f7e6ce9553874.tar.gz | |
Merge commit 'e7168d4c0cb279cf267690549ca92ad564572bc6'
* commit 'e7168d4c0cb279cf267690549ca92ad564572bc6':
configure: Drop redundant header check for d3d11.h
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1915,7 +1915,6 @@ HEADERS_LIST=" cdio_paranoia_h cdio_paranoia_paranoia_h cuda_h - d3d11_h dispatch_dispatch_h dev_bktr_ioctl_bt848_h dev_bktr_ioctl_meteor_h @@ -2651,7 +2650,7 @@ zmbv_encoder_select="zlib" crystalhd_deps="libcrystalhd_libcrystalhd_if_h" cuda_deps_any="libdl LoadLibrary" cuvid_deps="cuda" -d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext" +d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32" videotoolbox_hwaccel_deps="videotoolbox pthreads" videotoolbox_hwaccel_extralibs="-framework QuartzCore" @@ -5762,7 +5761,6 @@ check_func_headers glob.h glob enabled xlib && check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext -check_header d3d11.h check_header direct.h check_header dirent.h check_header dxgidebug.h |