vlc | branch: master | Rafaël Carré <[email protected]> | Mon Sep 10 23:16:05 2012 +0200| [9aa30ff3ed7abf56fda84b84a90e6644e09fe70c] | 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9aa30ff3ed7abf56fda84b84a90e6644e09fe70c --- 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 90e31c0..b22b248 100644 --- a/modules/codec/avcodec/dxva2.c +++ b/modules/codec/avcodec/dxva2.c @@ -61,6 +61,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 */ @@ -75,6 +76,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
