# HG changeset patch
# User alex
# Date 1066828920 0
# Node ID 30eccb0d1a648c8f9b0463c83772ba011a8bf87a
# Parent  836f909be1e39fd519c2ba1458ef1e23adb77887
fixed -nocolorkey

diff -r 836f909be1e3 -r 30eccb0d1a64 cfg-mplayer.h
--- a/cfg-mplayer.h	Wed Oct 22 12:35:03 2003 +0000
+++ b/cfg-mplayer.h	Wed Oct 22 13:22:00 2003 +0000
@@ -272,7 +272,7 @@
 	// set bpp (x11+vm, dga, fbdev, vesa, svga?)
         {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32, NULL},
 	{"colorkey", &vo_colorkey, CONF_TYPE_INT, 0, 0, 0, NULL},
-	{"nocolorkey", &vo_colorkey, CONF_TYPE_FLAG, 0, 0, 0xff000000, NULL},
+	{"nocolorkey", &vo_colorkey, CONF_TYPE_FLAG, 0, 0, 0x1000000, NULL},
 	// double buffering:  (mga/xmga, xv, vidix, vesa, fbdev)
 	{"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nodouble", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 1, 0, NULL},
diff -r 836f909be1e3 -r 30eccb0d1a64 libvo/vo_cvidix.c
--- a/libvo/vo_cvidix.c	Wed Oct 22 12:35:03 2003 +0000
+++ b/libvo/vo_cvidix.c	Wed Oct 22 13:22:00 2003 +0000
@@ -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;
diff -r 836f909be1e3 -r 30eccb0d1a64 libvo/vo_fbdev.c
--- a/libvo/vo_fbdev.c	Wed Oct 22 12:35:03 2003 +0000
+++ b/libvo/vo_fbdev.c	Wed Oct 22 13:22:00 2003 +0000
@@ -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;
diff -r 836f909be1e3 -r 30eccb0d1a64 libvo/vo_svga.c
--- a/libvo/vo_svga.c	Wed Oct 22 12:35:03 2003 +0000
+++ b/libvo/vo_svga.c	Wed Oct 22 13:22:00 2003 +0000
@@ -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;
diff -r 836f909be1e3 -r 30eccb0d1a64 libvo/vo_vesa.c
--- a/libvo/vo_vesa.c	Wed Oct 22 12:35:03 2003 +0000
+++ b/libvo/vo_vesa.c	Wed Oct 22 13:22:00 2003 +0000
@@ -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;
diff -r 836f909be1e3 -r 30eccb0d1a64 libvo/vo_xvidix.c
--- a/libvo/vo_xvidix.c	Wed Oct 22 12:35:03 2003 +0000
+++ b/libvo/vo_xvidix.c	Wed Oct 22 13:22:00 2003 +0000
@@ -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;