--- branches/dev-api-3/dshow/src/CXvidDecoder.h	2002/12/29 11:22:20	748
+++ branches/dev-api-3/dshow/src/CXvidDecoder.h	2002/12/29 15:00:18	749
@@ -4,34 +4,40 @@
 #include <xvid.h>
 #include "IXvidDecoder.h"
 
+#ifdef _DEBUG
+#include <stdio.h>	/* vsprintf */
+#define DPRINTF_BUF_SZ  1024
+static __inline void
+DPRINTF(char *fmt, ...)
+{
+	va_list args;
+	char buf[DPRINTF_BUF_SZ];
 
-#if defined(_DEBUG)
-#define DEBUG(X) OutputDebugString(X)
+	va_start(args, fmt);
+	vsprintf(buf, fmt, args);
+	OutputDebugString(buf);
+}
 #else
-#define DEBUG(X)
+static __inline void 
+DPRINTF(char *fmt, ...) { }
 #endif
 
-
 #define XVID_NAME_L		L"XviD MPEG-4 Video Decoder"
 
 /* --- fourcc --- */
 
 #define FOURCC_XVID	mmioFOURCC('X','V','I','D')
 #define FOURCC_DIVX	mmioFOURCC('D','I','V','X')
+#define FOURCC_DX50	mmioFOURCC('D','X','5','0')
 
 /* --- media uids --- */
 
-DEFINE_GUID(CLSID_XVID, 
-	0x64697678, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-
-DEFINE_GUID(CLSID_XVID_UC,
-	0x44495658, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-
-DEFINE_GUID(CLSID_DIVX,
-	0x78766964, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
-
-DEFINE_GUID(CLSID_DIVX_UC,
-	0x58564944, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_XVID,		mmioFOURCC('x','v','i','d'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_XVID_UC,	mmioFOURCC('X','V','I','D'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_DIVX,		mmioFOURCC('d','i','v','x'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_DIVX_UC,	mmioFOURCC('D','I','V','X'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_DX50,		mmioFOURCC('d','x','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_DX50_UC,	mmioFOURCC('D','X','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
 
 class CXvidDecoder : public CVideoTransformFilter, public IXvidDecoder, public ISpecifyPropertyPages