* Bug fixes and enhancements in the Gtk+/Gnome interfaces.

[vlc] / src / input / input_programs.c

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index ad72962ff42926130b80723651566537f7726a63..2f405584271aa486f013439a70094d50d24762d4 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.41 2001/03/15 01:42:20 sam 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 );
+    }
 }
 
 /*****************************************************************************
@@ -366,6 +371,7 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
     p_es->p_pes = NULL;
     p_es->p_decoder_fifo = NULL;
     p_es->b_audio = 0;
+    p_es->b_spu = 0;
 
     if( i_data_len )
     {
@@ -503,6 +509,7 @@ static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es,
     p_config->pf_init_bit_stream = InitBitstream;
 
     p_input->stream.i_selected_es_number++;
+
     p_input->stream.pp_selected_es = realloc(
                                        p_input->stream.pp_selected_es,
                                        p_input->stream.i_selected_es_number
@@ -590,7 +597,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
 
     if( p_es->p_decoder_fifo != NULL )
     {
-        intf_ErrMsg( "ES %d is already selected", p_es->i_id );
+        intf_ErrMsg( "ES 0x%x is already selected", p_es->i_id );
         return( -1 );
     }
 
@@ -655,7 +662,7 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         break;
 
     default:
-        intf_ErrMsg( "Unknown stream type %d", p_es->i_type );
+        intf_ErrMsg( "Unknown stream type 0x%x", p_es->i_type );
         return( -1 );
         break;
     }
@@ -682,7 +689,7 @@ int input_UnselectES( input_thread_t * p_input, es_descriptor_t * p_es )
 
     if( p_es->p_decoder_fifo == NULL )
     {
-        intf_ErrMsg( "ES %d is not selected", p_es->i_id );
+        intf_ErrMsg( "ES 0x%x is not selected", p_es->i_id );
         return( -1 );
     }