* When unselecting an ES, we must ged rid of p_es->p_pes so that it is

  regererated when we select this ES again. It made vlc segfault when
  switching from some stream to another, or when switching program
  in satellite input.

diff --git a/plugins/satellite/input_satellite.c b/plugins/satellite/input_satellite.c
index 55d8c66d377c63b24b3d16fe0eb604a46c54004c..2fee8cb7f570bbbd6a2824a9ba16f84bb768527d 100644 (file)
--- a/plugins/satellite/input_satellite.c
+++ b/plugins/satellite/input_satellite.c
@@ -311,7 +311,6 @@ int SatelliteSetProgram( input_thread_t    * p_input,
             if ( p_es->p_decoder_fifo )
             {
                 input_UnselectES( p_input , p_es );
-                p_es->p_pes = NULL; /* FIXME */
             }
             if ( p_es->i_dmx_fd )
             {

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 48c2cffd8f809f3b6eca6c0734caee8545a5aff0..d0f1f40f2dcda6ac48f93cebe47dc3ff66cb6dbe 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-2001 VideoLAN
- * $Id: input_programs.c,v 1.76 2002/03/21 02:27:04 jobi Exp $
+ * $Id: input_programs.c,v 1.77 2002/03/28 03:53:15 jobi Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -692,6 +692,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
     }
 
     input_EndDecoder( p_input, p_es );
+    free( p_es->p_pes );
 
     if( ( p_es->p_decoder_fifo == NULL ) &&
         ( p_input->stream.i_selected_es_number > 0 ) )