Fixed a crash when pausing.

diff --git a/include/threads.h b/include/threads.h
index 6704bc05eee69016b8bd4c776d7b297040093f89..6163fa7127d45e00494b83ee4abdc840756fdc8f 100644 (file)
--- 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 <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -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 c7aa02f9fda33fdb6ab8683dcefd9c7d59751e20..a3be45230f6a282f5c2719d6ba1961a2ecd8d570 100644 (file)
--- 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 <shanegh@optusnet.com.au>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -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;
     }