aboutsummaryrefslogtreecommitdiffhomepage
path: root/drivers/radeon
diff options
context:
space:
mode:
authorGravatar pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-20 14:37:09 +0000
committerGravatar pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-06-20 14:37:09 +0000
commitf083f1beaa3e3a88c390cf57c161dd1c2c41af67 (patch)
tree34fd014e05b6b7778a361e00a71b3ed691ecd747 /drivers/radeon
parent4317c99d92d2db22f203502994ccf980ab9990cf (diff)
fix fourcc's problem
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6472 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers/radeon')
-rw-r--r--drivers/radeon/radeon_vid.c4
-rw-r--r--drivers/radeon/radeon_vid.h12
2 files changed, 13 insertions, 3 deletions
diff --git a/drivers/radeon/radeon_vid.c b/drivers/radeon/radeon_vid.c
index d12449eed1..2999d9ad07 100644
--- a/drivers/radeon/radeon_vid.c
+++ b/drivers/radeon/radeon_vid.c
@@ -345,13 +345,13 @@ static char *fourcc_format_name(int format)
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");
diff --git a/drivers/radeon/radeon_vid.h b/drivers/radeon/radeon_vid.h
index f0659ea1a7..1c555863c7 100644
--- a/drivers/radeon/radeon_vid.h
+++ b/drivers/radeon/radeon_vid.h
@@ -64,8 +64,13 @@ uint32_t num_frames;
#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 @@ uint32_t num_frames;
#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