diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:29:21 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-15 12:29:21 +0000 |
| commit | 906ba2b1ebb6fc8b16f768159ec36803b191fd1a (patch) | |
| tree | 14660b37e5338a5c61ad5b87f6074e88ec516bc1 /avmedia | |
| parent | cbece28fc6649b73ae2e90989271d103663dde32 (diff) | |
INTEGRATION: CWS obo21 (1.5.32); FILE MERGED
2007/12/12 11:20:47 obo 1.5.32.1: #i84233# Change for .Net 2008 / Vista SDK
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/win/framegrabber.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 882b5c0f72b2..93ad93cf8c1b 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -4,9 +4,9 @@ * * $RCSfile: framegrabber.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2007-03-26 13:46:05 $ + * last change: $Author: ihi $ $Date: 2008-01-15 13:29:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,7 +42,11 @@ #include <objbase.h> #include <strmif.h> #include <Amvideo.h> +#if defined(_MSC_VER) && (_MSC_VER < 1500) #include <Qedit.h> +#else +#include "interface.hxx" +#endif #include <uuids.h> #if defined _MSC_VER #pragma warning(pop) |