Mercurial > mplayer.hg
changeset 12926:6eb8d78e2d47
10l query format at least when used with vidix, disable colorkeying with vidix, should fix #38 and #33
| author | faust3 |
|---|---|
| date | Sun, 01 Aug 2004 11:17:27 +0000 |
| parents | 2abd8e24eb69 |
| children | ba7d39185cc1 |
| files | libvo/vo_vesa.c |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_vesa.c Sat Jul 31 22:17:23 2004 +0000 +++ b/libvo/vo_vesa.c Sun Aug 01 11:17:27 2004 +0000 @@ -465,6 +465,9 @@ { 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 @@ { 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 @@ 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); }