Index: libvo/vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.45
diff -u -r1.45 vo_gl.c
--- libvo/vo_gl.c	25 Jul 2004 12:49:01 -0000	1.45
+++ libvo/vo_gl.c	10 Aug 2004 15:44:07 -0000
@@ -73,11 +73,11 @@
   image_bytes = (IMGFMT_RGB_DEPTH(format)+7)/8;
   gl_texfmt = 3;
   switch (format) {
-    case IMGFMT_RGB24:
+    case IMGFMT_RGB:
       gl_format = GL_RGB;
       gl_type = GL_UNSIGNED_BYTE;
       break;
-    case IMGFMT_RGB32:
+    case IMGFMT_RGBA:
       gl_texfmt = 4;
       gl_format = GL_RGBA;
       gl_type = GL_UNSIGNED_BYTE;
@@ -92,15 +92,15 @@
 #ifdef GL_VERSION_1_2
     case IMGFMT_RGB8:
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_BYTE_3_3_2;
+      gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
       break;
     case IMGFMT_RGB15:
       gl_format = GL_RGBA;
-      gl_type = GL_UNSIGNED_SHORT_5_5_5_1;
+      gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
       break;
     case IMGFMT_RGB16:
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_SHORT_5_6_5;
+      gl_type = GL_UNSIGNED_SHORT_5_6_5_REV;
       break;
     case IMGFMT_BGR8:
       // special case as red and blue have a differen number of bits.
@@ -108,21 +108,21 @@
       // by nVidia drivers, and in addition would give more bits to
       // blue than to red, which isn't wanted
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
+      gl_type = GL_UNSIGNED_BYTE_3_3_2;
       break;
     case IMGFMT_BGR15:
       gl_format = GL_BGRA;
-      gl_type = GL_UNSIGNED_SHORT_5_5_5_1;
+      gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
       break;
     case IMGFMT_BGR16:
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_SHORT_5_6_5_REV;
+      gl_type = GL_UNSIGNED_SHORT_5_6_5;
       break;
-    case IMGFMT_BGR24:
+    case IMGFMT_BGR:
       gl_format = GL_BGR;
       gl_type = GL_UNSIGNED_BYTE;
       break;
-    case IMGFMT_BGR32:
+    case IMGFMT_BGRA:
       gl_texfmt = 4;
       gl_format = GL_BGRA;
       gl_type = GL_UNSIGNED_BYTE;
@@ -340,7 +340,7 @@
 static uint32_t
 query_format(uint32_t format)
 {
-    if ((format == IMGFMT_RGB24) || (format == IMGFMT_RGB32))
+    if ((format == IMGFMT_RGB) || (format == IMGFMT_RGBA))
         return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
     if (many_fmts && find_gl_format(format))
         return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;