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
This commit is contained in:
faust3 2004-08-01 11:17:27 +00:00
parent 7b5bcad11f
commit 9db0e66a3b
1 changed files with 5 additions and 0 deletions

View File

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