Mercurial > mplayer.hg

changeset 6471:cc66affa965a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix fourcc's problem
author pontscho
date Thu, 20 Jun 2002 14:37:09 +0000
parents 7051757b01df
children 210db1a84098
files drivers/radeon/radeon_vid.c drivers/radeon/radeon_vid.h
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/drivers/radeon/radeon_vid.c	Thu Jun 20 11:52:51 2002 +0000
+++ b/drivers/radeon/radeon_vid.c	Thu Jun 20 14:37:09 2002 +0000
@@ -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");
--- a/drivers/radeon/radeon_vid.h	Thu Jun 20 11:52:51 2002 +0000
+++ b/drivers/radeon/radeon_vid.h	Thu Jun 20 14:37:09 2002 +0000
@@ -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