[Mplayer-cvslog] CVS: main/drivers/radeon radeon_vid.c,1.39,1.40 radeon_vid.h,1.3,1.4

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/drivers/radeon
In directory mail:/var/tmp.root/cvs-serv27777

Modified Files:
	radeon_vid.c radeon_vid.h 
Log Message:
fix fourcc's problem

Index: radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- radeon_vid.c	2 Jan 2002 14:46:55 -0000	1.39
+++ radeon_vid.c	20 Jun 2002 14:37:09 -0000	1.40
@@ -345,13 +345,13 @@
 	case IMGFMT_IY41: return("Packed IY41");
 	case IMGFMT_IYU1: return("Packed IYU1");
 	case IMGFMT_IYU2: return("Packed IYU2");
-	case IMGFMT_UYVY: return("Packed UYVY");
 	case IMGFMT_UYNV: return("Packed UYNV");
 	case IMGFMT_cyuv: return("Packed CYUV");
 	case IMGFMT_Y422: return("Packed Y422");
 	case IMGFMT_YUY2: return("Packed YUY2");
 	case IMGFMT_YUNV: return("Packed YUNV");
-	case IMGFMT_YVYU: return("Packed YVYU");
+	case IMGFMT_UYVY: return("Packed UYVY");
+//	case IMGFMT_YVYU: return("Packed YVYU");
 	case IMGFMT_Y41P: return("Packed Y41P");
 	case IMGFMT_Y211: return("Packed Y211");
 	case IMGFMT_Y41T: return("Packed Y41T");

Index: radeon_vid.h
===================================================================
RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- radeon_vid.h	29 Nov 2001 17:07:52 -0000	1.3
+++ radeon_vid.h	20 Jun 2002 14:37:09 -0000	1.4
@@ -64,8 +64,13 @@
 #define IMGFMT_YVU9 0x39555659
 #define IMGFMT_IF09 0x39304649
 #define IMGFMT_YV12 0x32315659
+#if 0
 #define IMGFMT_I420 0x30323449
 #define IMGFMT_IYUV 0x56555949
+#else
+#define IMGFMT_I420 (('I'<<24)|('4'<<16)|('2'<<8)|'0')
+#define IMGFMT_IYUV (('I'<<24)|('Y'<<16)|('U'<<8)|'V')
+#endif
 #define IMGFMT_CLPL 0x4C504C43
 #define IMGFMT_Y800 0x30303859
 #define IMGFMT_Y8   0x20203859
@@ -76,11 +81,16 @@
 #define IMGFMT_IY41 0x31435949
 #define IMGFMT_IYU1 0x31555949
 #define IMGFMT_IYU2 0x32555949
-#define IMGFMT_UYVY 0x59565955
 #define IMGFMT_UYNV 0x564E5955
 #define IMGFMT_cyuv 0x76757963
 #define IMGFMT_Y422 0x32323459
+#if 0
 #define IMGFMT_YUY2 0x32595559
+#define IMGFMT_UYVY 0x59565955
+#else
+#define IMGFMT_YUY2 (('Y'<<24)|('U'<<16)|('Y'<<8)|'2')
+#define IMGFMT_UYVY (('U'<<24)|('Y'<<16)|('V'<<8)|'Y')
+#endif
 #define IMGFMT_YUNV 0x564E5559
 #define IMGFMT_YVYU 0x55595659
 #define IMGFMT_Y41P 0x50313459