diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 13:22:00 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 13:22:00 +0000 |
| commit | 836d21907540f1c9c1c3cfa6d5532ebb4928034d (patch) | |
| tree | 3dead25e1b5608f12ebecedf5d9202feff0ef989 | |
| parent | 29507a18ead6984ae388a28227c1f007761a7d37 (diff) | |
| download | mpv-836d21907540f1c9c1c3cfa6d5532ebb4928034d.tar.bz2 mpv-836d21907540f1c9c1c3cfa6d5532ebb4928034d.tar.xz | |
fixed -nocolorkey
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11217 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-mplayer.h | 2 | ||||
| -rw-r--r-- | libvo/vo_cvidix.c | 2 | ||||
| -rw-r--r-- | libvo/vo_fbdev.c | 2 | ||||
| -rw-r--r-- | libvo/vo_svga.c | 2 | ||||
| -rw-r--r-- | libvo/vo_vesa.c | 2 | ||||
| -rw-r--r-- | libvo/vo_xvidix.c | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index b44548133e..9db4da707b 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -272,7 +272,7 @@ m_option_t mplayer_opts[]={ // 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 --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c index 3f6ae80ded..62c79d2c01 100644 --- a/libvo/vo_cvidix.c +++ b/libvo/vo_cvidix.c @@ -48,7 +48,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,uint32_ 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 --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index b9c61713b4..18bfbfde38 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -981,7 +981,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, { 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 --git a/libvo/vo_svga.c b/libvo/vo_svga.c index 9a973061cb..25fa02e7c3 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -531,7 +531,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 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 --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 4804274200..9da76fe01d 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -965,7 +965,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin { 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 --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 21594f59bc..d83fc141b8 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -197,7 +197,7 @@ static void set_window(int force_update) /* 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 @@ else { 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; |