Juste une modif � la con dans video_output pour que le message "waiting

 for stream" s'affiche d�s le lancement du vlc. En m�me temps �a me
 permet de tester que la migration du CVS sur shiva a fonctionn�.

diff --git a/src/video_output/video_fb.c b/src/video_output/video_fb.c
index b9aecc0252d66046b0c87fe63ad8e4e1f1622a37..56bcfa81e0a07c96656882af287f56a5d795e1b6 100644 (file)
--- a/src/video_output/video_fb.c
+++ b/src/video_output/video_fb.c
@@ -106,7 +106,7 @@ void vout_SysEnd( vout_thread_t *p_vout )
 /******************************************************************************
  * vout_SysDestroy: destroy FB video thread output method
  ******************************************************************************
- * Terminate an output method created by vout_FBCreateOutputMethod
+ * Terminate an output method created by vout_CreateOutputMethod
  ******************************************************************************/
 void vout_SysDestroy( vout_thread_t *p_vout )
 {

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 1dd00056769ff6b343e38367e95683db6fc2de3d..b7c0dd66319827fa8c22c54090fa7ea44e5a2a36 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -112,6 +112,7 @@ vout_thread_t * vout_CreateThread               ( char *psz_display, int i_root_
 
     /* Initialize idle screen */
     p_vout->last_display_date   = mdate();
+    p_vout->last_display_date   = 0;
     p_vout->last_idle_date      = 0;
 
 #ifdef STATS
@@ -1631,7 +1632,7 @@ static int RenderIdle( vout_thread_t *p_vout )
     int         i_x = 0, i_y = 0;                            /* text position */    
     int         i_width, i_height;                               /* text size */    
     mtime_t     current_date;                                 /* current date */
-    const char *psz_text = "no stream";                    /* text to display */
+    const char *psz_text = "waiting for stream ...";       /* text to display */
     
     
     current_date = mdate();