* More consistency in the p_input->stream management.

diff --git a/plugins/mpeg/input_ps.c b/plugins/mpeg/input_ps.c
index 7f9850c1329fec4fb1383b295521eab92d09a37c..8da1618fd38f747ce4b4011e2ae5d5740b5ec821 100644 (file)
--- a/plugins/mpeg/input_ps.c
+++ b/plugins/mpeg/input_ps.c
@@ -2,7 +2,7 @@
  * input_ps.c: PS demux and packet management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.9 2001/02/20 08:47:25 stef Exp $
+ * $Id: input_ps.c,v 1.10 2001/03/02 15:51:22 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -301,7 +301,6 @@ static void PSInit( input_thread_t * p_input )
  *****************************************************************************/
 static void PSEnd( input_thread_t * p_input )
 {
-    free( p_input->stream.p_demux_data );
     free( p_input->p_plugin_data );
 }
 

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index ad72962ff42926130b80723651566537f7726a63..77d89e343b596fb731c48294acafe1f56489f293 100644 (file)
--- a/src/input/input_programs.c
+++ b/src/input/input_programs.c
@@ -2,7 +2,7 @@
  * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.38 2001/03/02 13:49:37 massiot Exp $
+ * $Id: input_programs.c,v 1.39 2001/03/02 15:51:22 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -87,6 +87,11 @@ void input_EndStream( input_thread_t * p_input )
     {
         input_DelES( p_input, p_input->stream.pp_es[0] );
     }
+
+    if( p_input->stream.p_demux_data != NULL )
+    {
+        free( p_input->stream.p_demux_data );
+    }
 }
 
 /*****************************************************************************