RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-10 11:41:37 +00:00
Code Issues Releases Wiki Activity

- fix black screen problem on reinit

Browse Source 
- disable colorkey autopainting when painting it manually


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15187 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
al 2005-04-16 15:52:03 +00:00
parent caac0170ab
commit c3105be29a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libvo/vo_xv.c
View File

@ -426,7 +426,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
panscan_calc(); panscan_calc();
XClearWindow(mDisplay, vo_window);
#if 0 #if 0
#ifdef HAVE_SHM #ifdef HAVE_SHM
if (Shmem_Flag) if (Shmem_Flag)

10
libvo/x11_common.c
View File

@ -2407,11 +2407,12 @@ int vo_xv_init_colorkey()
} }
} }
xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" );
/* should we draw the colorkey ourselves or activate autopainting? */ /* should we draw the colorkey ourselves or activate autopainting? */
if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) if ( xv_ck_info.method == CK_METHOD_AUTOPAINT )
{ {
rez = !Success; // reset rez to something different than Success rez = !Success; // reset rez to something different than Success
xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" );
if ( xv_atom != None ) // autopaint is supported if ( xv_atom != None ) // autopaint is supported
{ {
@ -2424,6 +2425,13 @@ int vo_xv_init_colorkey()
xv_ck_info.method = CK_METHOD_MANUALFILL; xv_ck_info.method = CK_METHOD_MANUALFILL;
} }
} }
else // disable colorkey autopainting if supported
{
if ( xv_atom != None ) // we have autopaint attribute
{
XvSetPortAttribute( mDisplay, xv_port, xv_atom, 0 );
}
}
} }
else // do no colorkey drawing at all else // do no colorkey drawing at all
{ {