diff options
| author | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-01 11:17:27 +0000 |
|---|---|---|
| committer | faust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-08-01 11:17:27 +0000 |
| commit | 9db0e66a3bdc8afb5bc762b87495c395f743d5a7 (patch) | |
| tree | efaf10b6cd4d4773bad8f8f46ef4a9c8e7ba83a7 | |
| parent | 7b5bcad11f6b82afe0d8e2df901500d1b2f17574 (diff) | |
| download | mpv-9db0e66a3bdc8afb5bc762b87495c395f743d5a7.tar.bz2 mpv-9db0e66a3bdc8afb5bc762b87495c395f743d5a7.tar.xz | |
10l query format at least when used with vidix, disable colorkeying with vidix, should fix #38 and #33
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12927 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/vo_vesa.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 22e4c2509e..c4aa69494f 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -465,6 +465,9 @@ static uint32_t query_format(uint32_t format) { if(verbose > 2) printf("vo_vesa: query_format was called: %x (%s)\n",format,vo_format_name(format)); +#ifdef CONFIG_VIDIX + if(vidix_name)return(vidix_query_fourcc(format)); +#endif return 1 | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; /* due new SwScale code */ } @@ -982,6 +985,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 0 if (!(vo_colorkey & 0xFF000000)) { gr_key.ckey.op = CKEY_TRUE; @@ -989,6 +993,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin gr_key.ckey.green = (vo_colorkey & 0x0000FF00) >> 8; gr_key.ckey.blue = vo_colorkey & 0x000000FF; } else +#endif gr_key.ckey.op = CKEY_FALSE; vidix_grkey_set(&gr_key); } |