[Mplayer-cvslog] CVS: main/libvo vo_vesa.c,1.100,1.101

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

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

Modified Files:
	vo_vesa.c 
Log Message:
10l query format at least when used with vidix, disable colorkeying with vidix, should fix #38 and #33

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- vo_vesa.c	25 Jun 2004 17:29:18 -0000	1.100
+++ vo_vesa.c	1 Aug 2004 11:17:27 -0000	1.101
@@ -465,6 +465,9 @@
 {
     if(verbose > 2)
         printf("vo_vesa: query_format was called: %x (%s)\n",format,vo_format_name(format));
+#ifdef CONFIG_VIDIX
+    if(vidix_name)return(vidix_query_fourcc(format));
+#endif
     return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */
 }
 
@@ -982,6 +985,7 @@
 		  {
 		    vidix_grkey_get(&gr_key);
 		    gr_key.key_op = KEYS_PUT;
+#if 0
 		    if (!(vo_colorkey & 0xFF000000))
 		    {
 			gr_key.ckey.op = CKEY_TRUE;
@@ -989,6 +993,7 @@
 			gr_key.ckey.green = (vo_colorkey & 0x0000FF00) >> 8;
 			gr_key.ckey.blue = vo_colorkey & 0x000000FF;
 		    } else
+#endif
 			gr_key.ckey.op = CKEY_FALSE;
 		    vidix_grkey_set(&gr_key);
 		  }