diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-06-24 14:17:13 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-13 06:45:36 +0400 |
| commit | 0f54c97f58648cf160b7d85b700e38ba84214f69 (patch) | |
| tree | 9a06d1d80caf6e154249999a8327165d5eb0dd59 | |
| parent | a1f678f7ca48d2dd9614e30f1d9c58bfaac07bda (diff) | |
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ö <martin@martin.st>
(cherry picked from commit fa84506177f0246b30d4ea6a99ee5d419f3e4550)
Conflicts:
configure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/dxva2_internal.h | 7 |
2 files changed, 9 insertions, 0 deletions
@@ -1168,6 +1168,7 @@ HAVE_LIST=" dlfcn_h dlopen dos_paths + dxva_h ebp_available ebx_available exp2 @@ -3047,6 +3048,7 @@ check_func_headers windows.h MapViewOfFile check_func_headers windows.h VirtualAlloc check_header dlfcn.h +check_header dxva.h check_header dxva2api.h -D_WIN32_WINNT=0x0600 check_header libcrystalhd/libcrystalhd_if.h check_header malloc.h diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 23d4d87522..fcf45bc664 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" |