- dshow: backporting from 0.8.6

344289ce · Damien Fouilleul · 4b482440 · 344289ce · 344289ce · 344289ce
Commit 344289ce authored Dec 06, 2006 by Damien Fouilleul
Showing with 7 additions and 0 deletions

modules/access/dshow/common.h modules/access/dshow/common.h +3 -0

modules/access/dshow/dshow.cpp modules/access/dshow/dshow.cpp +1 -0

modules/access/dshow/filter.h modules/access/dshow/filter.h +3 -0

No files found.
--- 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_

--- 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>

--- 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_