[vlc-commits] Remove mingw-w64 2.0 workarounds

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue May 22 00:14:30 2012 -0400| [0c5887eea18f487f647aca3bd57749824dc929f1] | committer: Rafaël Carré

Remove mingw-w64 2.0 workarounds

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

 modules/access/dshow/vlc_dshow.h |    8 +-------
 modules/codec/avcodec/dxva2.c    |    7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/modules/access/dshow/vlc_dshow.h b/modules/access/dshow/vlc_dshow.h
index 40402dd..b1f7207 100644
--- a/modules/access/dshow/vlc_dshow.h
+++ b/modules/access/dshow/vlc_dshow.h
@@ -39,13 +39,7 @@
 #include <ksmedia.h>
 #include <ddraw.h>
 
-#ifdef __MINGW64_VERSION_MAJOR
-
-#if __MINGW64_VERSION_MAJOR < 3
-DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);
-#endif
-
-#else /* !__MINGW64_VERSION_MAJOR */
+#ifndef __MINGW64_VERSION_MAJOR
 
 #include <dshow.h>
 
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 66fb473..dacaf08 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -75,12 +75,7 @@
 #ifdef __MINGW32__
 # include <_mingw.h>
 
-# if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 3
-#  undef  IDirect3DDeviceManager9_Release
-#  define IDirect3DDeviceManager9_Release(This) (This)->lpVtbl->Release(This)
-# endif
-
-# if !defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3
+# if !defined(__MINGW64_VERSION_MAJOR)
 #  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)