vlc/vlc-2.0 | branch: master | Rafaël Carré <[email protected]> | Mon Sep 10 23:16:05 2012 +0200| [3c59237f472d92a8c3f6b650bbc177d62fd0c450] | committer: Rafaël Carré
dxva2: include needed headers For mingw.org, we ship a single dxva2api.h which contains stuff normally present in dxva.h, so skip dxva.h. (cherry picked from commit 9aa30ff3ed7abf56fda84b84a90e6644e09fe70c) Signed-off-by: Rafaël Carré <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=3c59237f472d92a8c3f6b650bbc177d62fd0c450 --- modules/codec/avcodec/dxva2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c index 7636690..edbc501 100644 --- a/modules/codec/avcodec/dxva2.c +++ b/modules/codec/avcodec/dxva2.c @@ -65,6 +65,7 @@ #include <commctrl.h> #include <shlwapi.h> #include <d3d9.h> +#include <dxva2api.h> #include <initguid.h> /* must be last included to not redefine existing GUIDs */ @@ -84,6 +85,8 @@ # undef MS_GUID # define MS_GUID DEFINE_GUID /* dxva2api.h fails to declare those, redefine as static */ # define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT(1, 4, 4097) +# else +# include <dxva.h> # endif #endif /* __MINGW32__ */ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
