From 0e3c37886dcb1531cb9e9b69e62ab71f90bf41f6 Mon Sep 17 00:00:00 2001 From: Christophe Massiot Date: Mon, 3 Dec 2001 13:58:59 +0000 Subject: [PATCH] Fixed a crash when pausing. --- include/threads.h | 6 +++--- plugins/x11/vout_xvideo.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/threads.h b/include/threads.h index 6704bc05ee..6163fa7127 100644 --- a/include/threads.h +++ b/include/threads.h @@ -3,7 +3,7 @@ * This header provides a portable threads implementation. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: threads.h,v 1.30 2001/11/29 10:20:56 massiot Exp $ + * $Id: threads.h,v 1.31 2001/12/03 13:58:59 massiot Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -681,8 +681,8 @@ static __inline__ int _vlc_cond_wait( char * psz_file, int i_line, if( (i_result = pthread_cond_timedwait( p_condvar, p_mutex, &timeout )) ) { - intf_ErrMsg( "thread %d warning: Possible deadlock detected in cond_wait at %s:%d (%s)", - pthread_self(), psz_file, i_line, strerror(i_result) ); + intf_WarnMsg( 1, "thread %d warning: Possible deadlock detected in cond_wait at %s:%d (%s)", + pthread_self(), psz_file, i_line, strerror(i_result) ); } else { diff --git a/plugins/x11/vout_xvideo.c b/plugins/x11/vout_xvideo.c index c7aa02f9fd..a3be45230f 100644 --- a/plugins/x11/vout_xvideo.c +++ b/plugins/x11/vout_xvideo.c @@ -2,7 +2,7 @@ * vout_xvideo.c: Xvideo video output display method ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: vout_xvideo.c,v 1.32 2001/11/28 15:08:06 massiot Exp $ + * $Id: vout_xvideo.c,v 1.33 2001/12/03 13:58:59 massiot Exp $ * * Authors: Shane Harper * Vincent Seguin @@ -1295,7 +1295,7 @@ static void XVideoDisplay( vout_thread_t *p_vout ) int i_dest_width, i_dest_height; int i_dest_x, i_dest_y; - if( !p_vout->p_sys->p_xvimage ) + if( !p_vout->p_sys->p_xvimage || !p_vout->p_rendered_pic ) { return; }