1
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-03 01:31:53 +02:00

* modules/video_output/x11/xcommon.c: fixed a bug with fullscreen and sawfish.

* modules/codec/ffmpeg/video.c: forgot a debug message.
This commit is contained in:
Gildas Bazin 2003-08-13 18:39:53 +00:00
parent b83deb14df
commit 84509c429f
2 changed files with 8 additions and 11 deletions

View File

@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: video.c,v 1.39 2003/08/12 17:01:35 gbazin Exp $
* $Id: video.c,v 1.40 2003/08/13 18:39:53 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
@ -597,7 +597,6 @@ usenextdata:
p_vdec->p_ff_pic->pict_type == FF_B_TYPE ) )
{
p_vdec->pts = p_vdec->p_ff_pic->pts;
msg_Err( p_vdec->p_fifo, "new pts: "I64Fd, p_vdec->pts );
}
if( p_vdec->pts <= 0 )

View File

@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.28 2003/08/03 23:11:21 gbazin Exp $
* $Id: xcommon.c,v 1.29 2003/08/13 18:39:52 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
@ -1484,14 +1484,12 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
False, SubstructureRedirectMask,
(XEvent*)&event );
}
else
{
/* Make sure the change is effective */
XReparentWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
DefaultRootWindow( p_vout->p_sys->p_display ),
0, 0 );
}
/* Make sure the change is effective */
XReparentWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
DefaultRootWindow( p_vout->p_sys->p_display ),
0, 0 );
/* fullscreen window size and position */
p_vout->p_sys->p_win->i_width =