[MPlayer-cvslog] CVS: main/libvo vo_gl.c,1.58,1.59

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv12692/libvo

Modified Files:
	vo_gl.c 
Log Message:
4 and 8 bit formats use a palette, so we cannot really support them (atm).


Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- vo_gl.c	11 Nov 2004 19:39:23 -0000	1.58
+++ vo_gl.c	20 Nov 2004 10:57:39 -0000	1.59
@@ -126,10 +126,14 @@
       gl_type = GL_UNSIGNED_BYTE;
       break;
 #ifdef GL_VERSION_1_2
+#if 0
+    // we do not support palettized formats, although the format the
+    // swscale produces works
     case IMGFMT_RGB8:
       gl_format = GL_RGB;
       gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
       break;
+#endif
     case IMGFMT_RGB15:
       gl_format = GL_RGBA;
       gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
@@ -138,6 +142,7 @@
       gl_format = GL_RGB;
       gl_type = GL_UNSIGNED_SHORT_5_6_5_REV;
       break;
+#if 0
     case IMGFMT_BGR8:
       // special case as red and blue have a differen number of bits.
       // GL_BGR and GL_UNSIGNED_BYTE_3_3_2 isn't supported at least
@@ -146,6 +151,7 @@
       gl_format = GL_RGB;
       gl_type = GL_UNSIGNED_BYTE_3_3_2;
       break;
+#endif
     case IMGFMT_BGR15:
       gl_format = GL_BGRA;
       gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;