Commit 84509c42 authored by Gildas Bazin's avatar Gildas Bazin

* modules/video_output/x11/xcommon.c: fixed a bug with fullscreen and sawfish.
* modules/codec/ffmpeg/video.c: forgot a debug message.
parent b83deb14
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video.c: video decoder using ffmpeg library * video.c: video decoder using ffmpeg library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * 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> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com> * Gildas Bazin <gbazin@netcourrier.com>
...@@ -597,7 +597,6 @@ usenextdata: ...@@ -597,7 +597,6 @@ usenextdata:
p_vdec->p_ff_pic->pict_type == FF_B_TYPE ) ) p_vdec->p_ff_pic->pict_type == FF_B_TYPE ) )
{ {
p_vdec->pts = p_vdec->p_ff_pic->pts; 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 ) if( p_vdec->pts <= 0 )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins * xcommon.c: Functions common to the X11 and XVideo plugins
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * 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> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -1484,14 +1484,12 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) ...@@ -1484,14 +1484,12 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
False, SubstructureRedirectMask, False, SubstructureRedirectMask,
(XEvent*)&event ); (XEvent*)&event );
} }
else
{
/* Make sure the change is effective */ /* Make sure the change is effective */
XReparentWindow( p_vout->p_sys->p_display, XReparentWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window, p_vout->p_sys->p_win->base_window,
DefaultRootWindow( p_vout->p_sys->p_display ), DefaultRootWindow( p_vout->p_sys->p_display ),
0, 0 ); 0, 0 );
}
/* fullscreen window size and position */ /* fullscreen window size and position */
p_vout->p_sys->p_win->i_width = p_vout->p_sys->p_win->i_width =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment