Module: libav Branch: master Commit: fa84506177f0246b30d4ea6a99ee5d419f3e4550
Author: Ronald S. Bultje <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Sun Jun 24 11:17:13 2012 +0100 dxva2: include dxva.h if found 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: Martin Storsjö <[email protected]> --- configure | 2 ++ libavcodec/dxva2_internal.h | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 4a03846..6f63780 100755 --- a/configure +++ b/configure @@ -1071,6 +1071,7 @@ HAVE_LIST=" dlfcn_h dlopen dos_paths + dxva_h ebp_available ebx_available exp2 @@ -2870,6 +2871,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_internal.h b/libavcodec/dxva2_internal.h index 57fc7bd..e2305b1 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -25,7 +25,14 @@ #define _WIN32_WINNT 0x0600 #define COBJMACROS + +#include "config.h" + #include "dxva2.h" +#if HAVE_DXVA_H +#include <dxva.h> +#endif + #include "avcodec.h" #include "mpegvideo.h" _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
