RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed -nocolorkey 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11217 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-10-22 13:22:00 +00:00
parent 29507a18ea
commit 836d219075
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cfg-mplayer.h
View File

@ -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},

2
libvo/vo_cvidix.c
View File

@ -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;

2
libvo/vo_fbdev.c
View File

@ -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;

2
libvo/vo_svga.c
View File

@ -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;

2
libvo/vo_vesa.c
View File

@ -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;

4
libvo/vo_xvidix.c
View File

@ -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;