summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 10:26:32 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 10:26:32 +0000
commit29f86ec19b5ea3e18ba9be462704c001526c07a6 (patch)
treee28a431e4b4d027e053920149b3f5496aa05bb81 /avmedia
parent7f6ebe0a5b38641a072f81d8cd54c776e7c1e03b (diff)
INTEGRATION: CWS sb59 (1.3.64); FILE MERGED
2006/08/16 16:02:26 sb 1.3.64.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/win/framegrabber.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 9e50df494836..f68cef59625a 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: framegrabber.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 19:44:41 $
+ * last change: $Author: obo $ $Date: 2006-10-12 11:26:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -34,12 +34,19 @@
************************************************************************/
#include <tools/prewin.h>
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable: 4917)
+#endif
#include <windows.h>
#include <objbase.h>
#include <strmif.h>
#include <Amvideo.h>
#include <Qedit.h>
#include <uuids.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
#include <tools/postwin.h>
#include "framegrabber.hxx"