[vlc-commits] dxva2: include d3d9.h before dxva2api.h

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Fri Feb 26 09:29:27 2016 +0100| [e9228cad3421b0d5f0a01b0d7461d8ba0084c501] | committer: Jean-Baptiste Kempf

dxva2: include d3d9.h before dxva2api.h

this is also done in ffmpeg/libav

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e9228cad3421b0d5f0a01b0d7461d8ba0084c501
---

 configure.ac                       |    4 ++--
 modules/codec/avcodec/directx_va.c |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index cd7ccbb..dae0aa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2425,7 +2425,7 @@ AS_IF([test "${enable_dxva2}" != "no"], [
     AS_IF([test "${enable_dxva2}" = "yes"],
               [AC_MSG_ERROR([Could not find required dxva2api.h])],
               [AC_MSG_WARN([dxva2api.h not found])])
-      ])
+      ],[#include <d3d9.h>])
   ],[
     AS_IF([test "x${enable_dxva2}" != "x"], [
       AC_MSG_ERROR([--enable-dxva2 and --disable-avcodec options are mutually exclusive.])
@@ -2464,7 +2464,7 @@ AS_IF([test "${enable_d3d11va}" != "no"], [
                     AS_IF([test "${enable_d3d11va}" = "yes"],
                           [AC_MSG_ERROR([Could not find required dxva2api.h])],
                           [AC_MSG_WARN([dxva2api.h not found])])
-                  ])
+                  ],[#include <d3d9.h>])
           ],[
             AS_IF([test "${enable_d3d11va}" = "yes"],
                   [AC_MSG_ERROR([Could not find required ID3D11VideoDecoder in d3d11.h])],
diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
index b8f2325..538b45e 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -51,6 +51,7 @@ static const int PROF_HEVC_MAIN[]    = { FF_PROFILE_HEVC_MAIN, 0 };
 static const int PROF_HEVC_MAIN10[]  = { FF_PROFILE_HEVC_MAIN,
                                          FF_PROFILE_HEVC_MAIN_10, 0 };
 
+#include <d3d9.h>
 #include <dxva2api.h>
 
 #include <initguid.h> /* must be last included to not redefine existing GUIDs */