diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-02 14:02:26 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-02 14:02:26 +0000 |
| commit | 0ee2d9f9f2116fbcf1d9d4faf2092ba4e509e76a (patch) | |
| tree | 12f87cc3b975c0bf4f37a3011202048100da4b02 /libvo | |
| parent | 5b2d8ece0d249015e92b5a9eee130a59943d9fcf (diff) | |
| download | mpv-0ee2d9f9f2116fbcf1d9d4faf2092ba4e509e76a.tar.bz2 mpv-0ee2d9f9f2116fbcf1d9d4faf2092ba4e509e76a.tar.xz | |
Query XV_COLORKEY only when listed in attribute list, fixes displaying with non overlay ports
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14636 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_xvmc.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 91d83942ef..1075c93041 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -209,31 +209,23 @@ int attrib_count,i; attributes = XvQueryPortAttributes(mDisplay, xv_port, &attrib_count); if(attributes!=NULL){ for (i = 0; i < attrib_count; i++){ - if (!strcmp(attributes[i].name, "XV_AUTOPAINT_COLORKEY")) + if (!strcmp(attributes[i].name, "XV_COLORKEY")) { - xv_atom = XInternAtom(mDisplay, "XV_AUTOPAINT_COLORKEY", False); + xv_atom = XInternAtom(mDisplay, "XV_COLORKEY", False); if(xv_atom!=None) { - rez=XvSetPortAttribute(mDisplay, xv_port, xv_atom, 1); - if(rez == Success) - keycolor_handling = AUTOPAINT_COLORKEY; + rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey); + if(rez == Success){ + keycolor = colorkey; + keycolor_handling = MANUALFILL_COLORKEY; + } } break; } - } + } XFree(attributes); } } - - xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False); - if(xv_atom == None) return; - rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey); - if(rez == Success){ - keycolor = colorkey; - if(keycolor_handling == AUTO_COLORKEY){ - keycolor_handling = MANUALFILL_COLORKEY; - } - } } //from vo_xmga @@ -439,7 +431,7 @@ int mc_ver,mc_rev; surface_render = NULL; xv_port = 0; number_of_surfaces = 0; - keycolor_handling = MANUALFILL_COLORKEY;//fixme + keycolor_handling = AUTO_COLORKEY; subpicture_alloc = 0; benchmark = 0; //disable PutImageto allow faster display than screen refresh |