From: "Ronald S. Bultje" <[email protected]>

Apparently, some build environments require dxva.h even for dxva2,
while others lack this header entirely.  Including it conditionally
allows building in both cases.

Signed-off-by: Mans Rullgard <[email protected]>
---
 configure          |    2 ++
 libavcodec/dxva2.h |    3 +++
 2 files changed, 5 insertions(+)

diff --git a/configure b/configure
index 083ef77..1cba930 100755
--- a/configure
+++ b/configure
@@ -1079,6 +1079,7 @@ HAVE_LIST="
     dlfcn_h
     dlopen
     dos_paths
+    dxva_h
     ebp_available
     ebx_available
     exp2
@@ -2907,6 +2908,7 @@ check_func_headers windows.h Sleep
 check_func_headers windows.h VirtualAlloc
 
 check_header dlfcn.h
+check_header dxva.h
 check_header dxva2api.h
 check_header malloc.h
 check_header poll.h
diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h
index c06f1f3..b9e3086 100644
--- a/libavcodec/dxva2.h
+++ b/libavcodec/dxva2.h
@@ -33,6 +33,9 @@
 
 #include <d3d9.h>
 #include <dxva2api.h>
+#if HAVE_DXVA_H
+#include <dxva.h>
+#endif
 
 /**
  * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
-- 
1.7.10.2

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to