--- trunk/xvidcore/dshow/src/CXvidDecoder.h	2010/10/17 18:31:52	1898
+++ trunk/xvidcore/dshow/src/CXvidDecoder.h	2011/03/17 15:13:25	1962
@@ -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 2010-10-17 18:31:46 Isibaar Exp $
+ * $Id: CXvidDecoder.h,v 1.11 2011-03-17 15:11:32 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -34,10 +34,29 @@
 /* --- fourcc --- */
 
 #define FOURCC_XVID	mmioFOURCC('X','V','I','D')
+#define FOURCC_xvid	mmioFOURCC('x','v','i','d')
 #define FOURCC_DIVX	mmioFOURCC('D','I','V','X')
+#define FOURCC_divx	mmioFOURCC('d','i','v','x')
 #define FOURCC_DX50	mmioFOURCC('D','X','5','0')
+#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_3IVX	mmioFOURCC('3','I','V','X')
+#define FOURCC_3ivx	mmioFOURCC('3','i','v','x')
+#define FOURCC_3IV0	mmioFOURCC('3','I','V','0')
+#define FOURCC_3iv0	mmioFOURCC('3','i','v','0')
+#define FOURCC_3IV1	mmioFOURCC('3','I','V','1')
+#define FOURCC_3iv1	mmioFOURCC('3','i','v','1')
+#define FOURCC_3IV2	mmioFOURCC('3','I','V','2')
+#define FOURCC_3iv2	mmioFOURCC('3','i','v','2')
+#define FOURCC_LMP4	mmioFOURCC('L','M','P','4')
+#define FOURCC_lmp4	mmioFOURCC('l','m','p','4')
+#define FOURCC_RMP4	mmioFOURCC('R','M','P','4')
+#define FOURCC_rmp4	mmioFOURCC('r','m','p','4')
+#define FOURCC_SMP4	mmioFOURCC('S','M','P','4')
+#define FOURCC_smp4	mmioFOURCC('s','m','p','4')
+#define FOURCC_HDX4	mmioFOURCC('H','D','X','4')
+#define FOURCC_hdx4	mmioFOURCC('h','d','x','4')
 
 /* --- media uids --- */
 
@@ -47,6 +66,22 @@
 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);
+DEFINE_GUID(CLSID_3IVX,		mmioFOURCC('3','i','v','x'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IVX_UC,	mmioFOURCC('3','I','V','X'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV0,		mmioFOURCC('3','i','v','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV0_UC,	mmioFOURCC('3','I','V','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV1,		mmioFOURCC('3','i','v','1'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV1_UC,	mmioFOURCC('3','I','V','1'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV2,		mmioFOURCC('3','i','v','2'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_3IV2_UC,	mmioFOURCC('3','I','V','2'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_LMP4,		mmioFOURCC('l','m','p','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_LMP4_UC,	mmioFOURCC('L','M','P','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_RMP4,		mmioFOURCC('r','m','p','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_RMP4_UC,	mmioFOURCC('R','M','P','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_SMP4,		mmioFOURCC('s','m','p','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_SMP4_UC,	mmioFOURCC('S','M','P','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_HDX4,		mmioFOURCC('h','d','x','4'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_HDX4_UC,	mmioFOURCC('H','D','X','4'), 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);
 
@@ -118,7 +153,7 @@
 
 private :
 
-	HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format);
+	HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format, int noflip);
 	HRESULT OpenLib();
 	void CloseLib();