summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-02-09 00:56:37 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-02-09 01:03:32 +0200
commit18ac748cf879cdae66ea9a86bf19f66be41f7fdb (patch)
tree6b41650e1c1f93e3d4cf6554a8652c29279ad0fb /avmedia
parentd6f13b2b2f6ce0fa8a0139faaffe67d5ae27d382 (diff)
prewin.h already includes <windows.h>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.cxx1
-rw-r--r--avmedia/source/win/framegrabber.cxx1
-rw-r--r--avmedia/source/win/player.cxx1
-rw-r--r--avmedia/source/win/window.cxx1
4 files changed, 0 insertions, 4 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 60abcb5201..e0b161c483 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include <prewin.h>
-#include <windows.h>
#include <objbase.h>
#include <strmif.h>
#include <Amvideo.h>
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 852a291b5d..9633aa7e98 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -31,7 +31,6 @@
#pragma warning(push, 1)
#pragma warning(disable: 4917)
#endif
-#include <windows.h>
#include <objbase.h>
#include <strmif.h>
#include <Amvideo.h>
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index afafc25575..f44f22f63b 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -31,7 +31,6 @@
#pragma warning(push, 1)
#pragma warning(disable: 4917)
#endif
-#include <windows.h>
#include <objbase.h>
#include <strmif.h>
#include <control.h>
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 05bbfbdda3..ca66b0e8e0 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -31,7 +31,6 @@
#pragma warning(push, 1)
#pragma warning(disable: 4917)
#endif
-#include <windows.h>
#include <objbase.h>
#include <strmif.h>
#include <control.h>