--- trunk/xvidcore/dshow/src/CXvidDecoder.h	2005/03/14 01:18:20	1605
+++ trunk/xvidcore/dshow/src/CXvidDecoder.h	2010/10/16 12:20:30	1896
@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - XviD Decoder part of the DShow Filter  -
  *
- *  Copyright(C) 2002-2003 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2002-2010 Peter Ross <pross@xvid.org>
  *
  *  This program is free software ; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: CXvidDecoder.h,v 1.5 2005-03-14 01:18:20 Isibaar Exp $
+ * $Id: CXvidDecoder.h,v 1.8 2010-10-16 12:20:30 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -30,14 +30,15 @@
 #include "IXvidDecoder.h"
 
 
-#define XVID_NAME_L		L"XviD MPEG-4 Video Decoder"
+#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')
-#define FOURCC_MP4V	mmioFOURCC('m','p','4','v')
+#define FOURCC_MP4V	mmioFOURCC('M','P','4','V')
+#define FOURCC_mp4v	mmioFOURCC('m','p','4','v')
 
 /* --- media uids --- */
 
@@ -48,6 +49,7 @@
 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);
 DEFINE_GUID(CLSID_MP4V,		mmioFOURCC('m','p','4','v'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_MP4V_UC,		mmioFOURCC('M','P','4','V'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
 
 /* MEDIATYPE_IYUV is not always defined in the directx headers */
@@ -66,6 +68,9 @@
 	CXvidDecoder(LPUNKNOWN punk, HRESULT *phr);
 	~CXvidDecoder();
 
+	HRESULT CompleteConnect(PIN_DIRECTION direction, IPin *pReceivePin);
+	HRESULT BreakConnect(PIN_DIRECTION dir);
+
 	HRESULT CheckInputType(const CMediaType * mtIn);
 	HRESULT GetMediaType(int iPos, CMediaType * pmt);
 	HRESULT SetMediaType(PIN_DIRECTION direction, const CMediaType *pmt);
@@ -94,8 +99,13 @@
 	bool forced_ar;
 
 	int rgb_flip;
-
+#ifdef XVID_USE_TRAYICON
+	HWND MSG_hwnd; /* message handler window */
 };
+#define WM_ICONMESSAGE (WM_USER + 1)
+#else
+};
+#endif
 
 static const int PARS[][2] = {
 	{1, 1},
@@ -106,5 +116,4 @@
 	{0, 0},
 };
 
-
 #endif /* _FILTER_H_ */