diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-24 07:07:39 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-24 07:07:39 +0000 |
| commit | 3fe1744693a3462d00ce37aaa7b35030591109ce (patch) | |
| tree | 6cb0ffd8ef68b82645b76177cc6c08b4715f38c8 /third_party/BaseClasses/combase.cpp | |
| parent | 603594518c4cbe3c564df98e3cd86f34b89e5971 (diff) | |
Re #1276:
- Updated baseclasses VS2005 project setting (use VS property sheet, etc).
- Added PJMEDIA_VIDEO_DEV_HAS_DSHOW filter.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4072 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party/BaseClasses/combase.cpp')
| -rw-r--r-- | third_party/BaseClasses/combase.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/BaseClasses/combase.cpp b/third_party/BaseClasses/combase.cpp index ec62a88c..bf7e3512 100644 --- a/third_party/BaseClasses/combase.cpp +++ b/third_party/BaseClasses/combase.cpp @@ -7,6 +7,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved.
//------------------------------------------------------------------------------
+#include <pjmedia-videodev/config.h>
+
+#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0
#include <streams.h>
#pragma warning( disable : 4514 ) // Disable warnings re unused inline functions
@@ -263,3 +266,4 @@ BOOL WINAPI IsEqualObject(IUnknown *pFirst, IUnknown *pSecond) return (pUnknown1 == pUnknown2);
}
+#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */
|