- dshow: backporting from 0.8.6

diff --git a/modules/access/dshow/common.h b/modules/access/dshow/common.h
index b1103ea97dc4d8092b7b96fe2f4fbd1f2d668ed9..4b69d7e67928e1cf4d5fa6aef22a7456f6dfd67a 100644 (file)
--- a/modules/access/dshow/common.h
+++ b/modules/access/dshow/common.h
@@ -34,6 +34,9 @@ using namespace std;
 #   include <unknwn.h>
 #   include <ole2.h>
 #   include <limits.h>
+#   ifdef _WINGDI_
+#      undef _WINGDI_
+#   endif
 #   define _WINGDI_ 1
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 6c60686ba4f59a94d80a6bb025aa55b51527a2c2..f47757cdc1ffdf56ab1718d5ecb4084946ea476b 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_access.h>

diff --git a/modules/access/dshow/filter.h b/modules/access/dshow/filter.h
index 41236212db0c6b8554f8d6aaf06e4b28908058b2..73bea53f6f9883ac0487bdde561375677efbcbb8 100644 (file)
--- a/modules/access/dshow/filter.h
+++ b/modules/access/dshow/filter.h
@@ -34,6 +34,9 @@ using namespace std;
 #   include <unknwn.h>
 #   include <ole2.h>
 #   include <limits.h>
+#   ifdef _WINGDI_
+#      undef _WINGDI_
+#   endif
 #   define _WINGDI_ 1
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_