[Sumover-dev] [svn commit] r4471 - vic/branches/mpeg4/video

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Mon Jun 29 06:03:18 2009
New Revision: 4471

Modified:
   vic/branches/mpeg4/video/grabber-win32DS.h

Log:
Add the following pragma line
  #pragma include_alias("dxtrans.h", "qedit.h")
to avoid having to edit gedit.h due to dxtrans.h missing with some versions of the DirectX SDK's and VS2008.

Modified: vic/branches/mpeg4/video/grabber-win32DS.h
==============================================================================
--- vic/branches/mpeg4/video/grabber-win32DS.h	(original)
+++ vic/branches/mpeg4/video/grabber-win32DS.h	Mon Jun 29 06:03:18 2009
@@ -37,12 +37,14 @@
 
 #include <dshow.h>   // DirectShow
 #include <amstream.h>   // DirectShow
+
+#pragma include_alias("dxtrans.h", "qedit.h")
 #define __IDxtCompositor_INTERFACE_DEFINED__
 #define __IDxtAlphaSetter_INTERFACE_DEFINED__
 #define __IDxtJpeg_INTERFACE_DEFINED__
 #define __IDxtKey_INTERFACE_DEFINED__
-// Had to comment out #include  <dxtrans.h> from qedit.h - broken M$ setup?!
-// the above #define's make sure it's contents is not needed
+// dxtrans.h is missing with some DirectX SDKs and VisualStudio versions - broken M$ setup?!
+// the above #pragma and #define's make sure it's contents is not needed
 #include <qedit.h>   // DirectShow
 
 #include "crossbar.h"