diff options
| author | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-16 15:52:03 +0000 |
|---|---|---|
| committer | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-16 15:52:03 +0000 |
| commit | c3105be29a5d0a3d82a16b6868b5c1178a485ce7 (patch) | |
| tree | 7c526da2be12d048a8e85bc74ed4522da68cdbdd /libvo | |
| parent | caac0170ab97e16afda5ef21b33127e9450deb8b (diff) | |
| download | mpv-c3105be29a5d0a3d82a16b6868b5c1178a485ce7.tar.bz2 mpv-c3105be29a5d0a3d82a16b6868b5c1178a485ce7.tar.xz | |
- fix black screen problem on reinit
- disable colorkey autopainting when painting it manually
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15187 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_xv.c | 1 | ||||
| -rw-r--r-- | libvo/x11_common.c | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 9fbaea74ad..5affbdb2d9 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -426,7 +426,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, panscan_calc(); - XClearWindow(mDisplay, vo_window); #if 0 #ifdef HAVE_SHM if (Shmem_Flag) diff --git a/libvo/x11_common.c b/libvo/x11_common.c index b0dd506cec..6d455d8f48 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -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? */ if ( xv_ck_info.method == CK_METHOD_AUTOPAINT ) { 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 { @@ -2424,6 +2425,13 @@ int vo_xv_init_colorkey() 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 { |