summaryrefslogtreecommitdiffstats
path: root/libvo/vo_cvidix.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-17 09:08:37 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-17 09:08:37 +0000
commita34978c3a7ccdcc7b629134461ecffc95ec26364 (patch)
treeb7169a152b6a87ac75034c6d06e0eb96d3c3e70e /libvo/vo_cvidix.c
parente6bf2b355a0125b5d0be7b26f5a864f5b5166ef7 (diff)
downloadmpv-a34978c3a7ccdcc7b629134461ecffc95ec26364.tar.bz2
mpv-a34978c3a7ccdcc7b629134461ecffc95ec26364.tar.xz
Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
by Jake Page <jake@CS.Stanford.EDU> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11159 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_cvidix.c')
-rw-r--r--libvo/vo_cvidix.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/libvo/vo_cvidix.c b/libvo/vo_cvidix.c
index 997142a6ee..3f6ae80ded 100644
--- a/libvo/vo_cvidix.c
+++ b/libvo/vo_cvidix.c
@@ -48,8 +48,15 @@ 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;
- gr_key.ckey.op = CKEY_TRUE;
- gr_key.ckey.red = gr_key.ckey.green = gr_key.ckey.blue = 0;
+ 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;
+ gr_key.ckey.blue = vo_colorkey & 0x000000FF;
+ }
+ else
+ gr_key.ckey.op = CKEY_FALSE;
vidix_grkey_set(&gr_key);
}
return 0;