--- branches/release-1_3-branch/xvidcore/dshow/src/CXvidDecoder.h	2011/03/17 15:13:25	1962
+++ branches/release-1_3-branch/xvidcore/dshow/src/CXvidDecoder.h	2015/06/08 19:15:30	2102
@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - XviD Decoder part of the DShow Filter  -
  *
- *  Copyright(C) 2002-2010 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2002-2012 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.9.2.2 2011-03-17 15:13:25 Isibaar Exp $
+ * $Id$
  *
  ****************************************************************************/
 
@@ -30,6 +30,7 @@
 #include "IXvidDecoder.h"
 
 #define XVID_NAME_L		L"Xvid MPEG-4 Video Decoder"
+#define XVID_NAME_MFT_L	L"Xvid MPEG-4 Video Decoder MFT"
 
 /* --- fourcc --- */
 
@@ -193,13 +194,9 @@
 	UINT64 m_duration;
 #endif
 
-#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},