From a34978c3a7ccdcc7b629134461ecffc95ec26364 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 17 Oct 2003 09:08:37 +0000 Subject: Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support by Jake Page git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11159 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_xvidix.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'libvo/vo_xvidix.c') diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 14be69f70e..21594f59bc 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -197,11 +197,14 @@ static void set_window(int force_update) /* mDrawColorKey: */ /* fill drawable with specified color */ + if (vo_colorkey != 0xff000000) + { XSetBackground(mDisplay, vo_gc, 0L); XClearWindow( mDisplay,vo_window ); XSetForeground(mDisplay, vo_gc, colorkey); XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth, (vo_fs ? drwHeight - 1 : drwHeight)); + } /* flush, update drawable */ XFlush(mDisplay); @@ -346,10 +349,15 @@ else { vidix_grkey_get(&gr_key); gr_key.key_op = KEYS_PUT; - gr_key.ckey.op = CKEY_TRUE; - gr_key.ckey.red = r; - gr_key.ckey.green = g; - gr_key.ckey.blue = b; + if (vo_colorkey != 0xff000000) + { + gr_key.ckey.op = CKEY_TRUE; + gr_key.ckey.red = r; + gr_key.ckey.green = g; + gr_key.ckey.blue = b; + } + else + gr_key.ckey.op = CKEY_FALSE; vidix_grkey_set(&gr_key); } -- cgit v1.2.3