* src/video_output/video_output.c: fixed potential segfault.

* configure.ac: don't bail out if matroska headers are not found.

diff --git a/configure.ac b/configure.ac
index 799338d0d68b1a6044598c8acf3c555b1755a05c..1c85d176cbbd2181931467b88345f65d9efbca6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.46 2003/07/29 17:42:58 gbazin Exp $
+dnl $Id: configure.ac,v 1.47 2003/07/29 22:20:53 gbazin Exp $
 
 AC_INIT(vlc,0.6.1)
 
@@ -1418,8 +1418,6 @@ AC_LANG_PUSH(C++)
     ],[
       AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
     ])
-  ],[
-    AC_MSG_ERROR([libebml or libmatroska include files not found])
   ])
   CPPFLAGS="${CPPFLAGS_save}"
 AC_LANG_POP(C++)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 880891bfbb0767ea9a6ee53a50101fe471f31fe6..14ac99feb9ab8ae92df18e63b9b01c7fc5a0c9ae 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -5,7 +5,7 @@
  * thread, and destroy a previously oppened video output thread.
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.230 2003/07/23 22:01:25 gbazin Exp $
+ * $Id: video_output.c,v 1.231 2003/07/29 22:20:53 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -394,6 +394,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent,
         vlc_object_destroy( p_vout );
         return NULL;
     }
+
     p_vout->p_text_renderer_module = module_Need( p_vout, "text renderer", 
                                                  NULL );
     if( p_vout->p_text_renderer_module == NULL )
@@ -401,6 +402,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent,
        msg_Warn( p_vout, "no suitable text renderer module" );
        p_vout->pf_add_string = NULL;
     }
+
     /* Create a few object variables for interface interaction */
     var_Create( p_vout, "fullscreen", VLC_VAR_BOOL );
     text.psz_string = _("Fullscreen");
@@ -1048,7 +1050,8 @@ static void EndThread( vout_thread_t *p_vout )
         }
     }
 
-    module_Unneed( p_vout, p_vout->p_text_renderer_module );
+    if( p_vout->p_text_renderer_module )
+        module_Unneed( p_vout, p_vout->p_text_renderer_module );
     
     /* Destroy translation tables */
     p_vout->pf_end( p_vout );