[Mplayer-cvslog] CVS: main/libvo vo_cvidix.c,1.4,1.5 vo_fbdev.c,1.86,1.87 vo_svga.c,1.72,1.73 vo_vesa.c,1.96,1.97 vo_xvidix.c,1.63,1.64

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv26236/libvo

Modified Files:
	vo_cvidix.c vo_fbdev.c vo_svga.c vo_vesa.c vo_xvidix.c 
Log Message:
fixed -nocolorkey

Index: vo_cvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_cvidix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_cvidix.c	17 Oct 2003 09:08:37 -0000	1.4
+++ vo_cvidix.c	22 Oct 2003 13:22:00 -0000	1.5
@@ -48,7 +48,7 @@
   if(vidix_grkey_support()){
     vidix_grkey_get(&gr_key);
     gr_key.key_op = KEYS_PUT;
-    if (vo_colorkey != 0xff000000)
+    if (!(vo_colorkey & 0xff000000))
     {
 	gr_key.ckey.op = CKEY_TRUE;
 	gr_key.ckey.red = (vo_colorkey & 0x00FF0000) >> 16;

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- vo_fbdev.c	17 Oct 2003 09:08:37 -0000	1.86
+++ vo_fbdev.c	22 Oct 2003 13:22:00 -0000	1.87
@@ -981,7 +981,7 @@
 		{
 		    vidix_grkey_get(&gr_key);
 		    gr_key.key_op = KEYS_PUT;
-		    if (vo_colorkey != 0xff000000)
+		    if (!(vo_colorkey & 0xff000000))
 		    {
 			gr_key.ckey.op = CKEY_TRUE;
 			gr_key.ckey.red = (vo_colorkey & 0x00ff0000) >> 16;

Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- vo_svga.c	17 Oct 2003 09:08:37 -0000	1.72
+++ vo_svga.c	22 Oct 2003 13:22:00 -0000	1.73
@@ -531,7 +531,7 @@
     if(vidix_grkey_support()){
       vidix_grkey_get(&gr_key);
       gr_key.key_op = KEYS_PUT;
-      if (vo_colorkey != 0xFF000000) {
+      if (!(vo_colorkey & 0xFF000000)) {
 	gr_key.ckey.op = CKEY_TRUE;
 	gr_key.ckey.red = (vo_colorkey & 0x00FF0000) >> 16;
 	gr_key.ckey.green = (vo_colorkey & 0x0000FF00) >> 8;

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- vo_vesa.c	17 Oct 2003 09:08:37 -0000	1.96
+++ vo_vesa.c	22 Oct 2003 13:22:00 -0000	1.97
@@ -965,7 +965,7 @@
 		  {
 		    vidix_grkey_get(&gr_key);
 		    gr_key.key_op = KEYS_PUT;
-		    if (vo_colorkey != 0xFF000000)
+		    if (!(vo_colorkey & 0xFF000000))
 		    {
 			gr_key.ckey.op = CKEY_TRUE;
 			gr_key.ckey.red = (vo_colorkey & 0x00FF0000) >> 16;

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- vo_xvidix.c	17 Oct 2003 09:08:37 -0000	1.63
+++ vo_xvidix.c	22 Oct 2003 13:22:00 -0000	1.64
@@ -197,7 +197,7 @@
     /* mDrawColorKey: */
 
     /* fill drawable with specified color */
-    if (vo_colorkey != 0xff000000)
+    if (!(vo_colorkey & 0xff000000))
     {
     XSetBackground(mDisplay, vo_gc, 0L);
     XClearWindow( mDisplay,vo_window );
@@ -349,7 +349,7 @@
     {
 	vidix_grkey_get(&gr_key);
 	gr_key.key_op = KEYS_PUT;
-	if (vo_colorkey != 0xff000000)
+	if (!(vo_colorkey & 0xff000000))
 	{
 	    gr_key.ckey.op = CKEY_TRUE;
 	    gr_key.ckey.red = r;