[FFmpeg-cvslog] Merge commit 'e7168d4c0cb279cf267690549ca92ad564572bc6'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 16:05:45 2017 -0300| [084e7fbe49fb0935b733726c2b0f7e6ce9553874] | committer: James Almer

Merge commit 'e7168d4c0cb279cf267690549ca92ad564572bc6'

* commit 'e7168d4c0cb279cf267690549ca92ad564572bc6':
  configure: Drop redundant header check for d3d11.h

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=084e7fbe49fb0935b733726c2b0f7e6ce9553874
---

 configure | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index d01dd71a2e..7fe9d80ecc 100755
--- a/configure
+++ b/configure
@@ -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


======================================================================

diff --cc configure
index d01dd71a2e,16a5efa2ee..7fe9d80ecc
--- a/configure
+++ b/configure
@@@ -1910,12 -1556,10 +1910,11 @@@ HAVE_LIST_PUB=
  "
  
  HEADERS_LIST="
 -    AVFoundation_AVFoundation_h
      arpa_inet_h
 +    asm_types_h
      cdio_paranoia_h
      cdio_paranoia_paranoia_h
 +    cuda_h
-     d3d11_h
      dispatch_dispatch_h
      dev_bktr_ioctl_bt848_h
      dev_bktr_ioctl_meteor_h
@@@ -2639,23 -2185,17 +2638,23 @@@ wmv2_decoder_select="blockdsp error_res
  wmv2_encoder_select="h263_encoder wmv2dsp"
  wmv3_decoder_select="vc1_decoder"
  wmv3image_decoder_select="wmv3_decoder"
 -zerocodec_decoder_deps="zlib"
 -zlib_decoder_deps="zlib"
 -zlib_encoder_deps="zlib"
 -zmbv_decoder_deps="zlib"
 -zmbv_encoder_deps="zlib"
 +xma1_decoder_select="wmapro_decoder"
 +xma2_decoder_select="wmapro_decoder"
 +zerocodec_decoder_select="zlib"
 +zlib_decoder_select="zlib"
 +zlib_encoder_select="zlib"
 +zmbv_decoder_select="zlib"
 +zmbv_encoder_select="zlib"
  
  # hardware accelerators
 -d3d11va_deps="dxva_h ID3D11VideoDecoder"
 -dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32"
 -vda_deps="VideoDecodeAcceleration_VDADecoder_h blocks_extension pthreads"
 -vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
 +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"
 +xvmc_deps="X11_extensions_XvMClib_h"
  
  h263_vaapi_hwaccel_deps="vaapi"
  h263_vaapi_hwaccel_select="h263_decoder"
@@@ -5758,21 -4653,14 +5757,20 @@@ check_func_headers windows.h SetConsole
  check_func_headers windows.h Sleep
  check_func_headers windows.h VirtualAlloc
  check_struct windows.h "CONDITION_VARIABLE" Ptr
 +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
  check_header dxva.h
 -check_header dxva2api.h
 +check_header dxva2api.h -D_WIN32_WINNT=0x0600
  check_header io.h
 +check_header libcrystalhd/libcrystalhd_if.h
  check_header mach/mach_time.h
  check_header malloc.h
 +check_header net/udplite.h
  check_header poll.h
  check_header sys/mman.h
  check_header sys/param.h