* include/vlc_es.h: s/es_format_Free/es_format_Clean.

diff --git a/include/vlc_es.h b/include/vlc_es.h
index b42243da97fb456150779143f0dd134e79478460..7e78bd1869c300854840eece1140f41ca997bba9 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -2,7 +2,7 @@
  * vlc_es.h: Elementary stream formats descriptions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: vlc_es.h,v 1.9 2004/02/07 00:16:34 gbazin Exp $
+ * $Id: vlc_es.h,v 1.10 2004/02/07 00:33:08 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -196,12 +196,16 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
     }
 }
 
-static inline void es_format_Free( es_format_t *fmt )
+static inline void es_format_Clean( es_format_t *fmt )
 {
     if( fmt->psz_language ) free( fmt->psz_language );
+    fmt->psz_language = 0;
     if( fmt->psz_description ) free( fmt->psz_description );
+    fmt->psz_description = 0;
     if( fmt->i_extra > 0 ) free( fmt->p_extra );
+    fmt->i_extra = 0; fmt->p_extra = 0;
     if( fmt->video.p_palette ) free( fmt->video.p_palette );
+    fmt->video.p_palette = 0;
 }
 
 #endif

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 5ee04e685f9bb4af4d7babd4d740382db7fe233b..6f2d78f7f1d0bbd2d7c5716ff92227d5c41b0ded 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -2,7 +2,7 @@
  * ogg.c : ogg stream demux module for vlc
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: ogg.c,v 1.55 2004/02/07 00:16:34 gbazin Exp $
+ * $Id: ogg.c,v 1.56 2004/02/07 00:33:08 gbazin Exp $
  *
  * Author: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -1111,7 +1111,7 @@ static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg )
         if( p_ogg->pp_stream[i_stream]->p_packets_backup)
             free( p_ogg->pp_stream[i_stream]->p_packets_backup );
 
-        es_format_Free( &p_stream->fmt );
+        es_format_Clean( &p_stream->fmt );
 
         free( p_ogg->pp_stream[i_stream] );
     }