summaryrefslogtreecommitdiff
path: root/libavcodec/dxva2_internal.h
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-06-24 11:17:13 +0100
committerMartin Storsjö <martin@martin.st>2012-06-27 14:36:27 +0300
commitfa84506177f0246b30d4ea6a99ee5d419f3e4550 (patch)
tree43bdc7da52b17e9eec479e19ea8cad0b9d21e438 /libavcodec/dxva2_internal.h
parent46df708b45b34191973ef5181b052ce8e583bb4e (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>
Diffstat (limited to 'libavcodec/dxva2_internal.h')
-rw-r--r--libavcodec/dxva2_internal.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index 57fc7bd6f9..e2305b1a24 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"