The motion compensation routines are now modules as well ; choose your

[vlc] / src / input / input_programs.c

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 7a477aab39270191535194faacfed245c97f4e25..ddff45529212f1da49f3388715d566a54c82c4db 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.22 2001/01/08 18:16:33 sam Exp $
+ * $Id: input_programs.c,v 1.26 2001/01/18 05:13:22 sam Exp $
  *
  * Authors:
  *
@@ -40,7 +40,6 @@
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
 #include "input.h"
-#include "input_dec.h"
 
 #include "main.h"                                     /* --noaudio --novideo */
 
@@ -76,19 +75,15 @@ void input_InitStream( input_thread_t * p_input, size_t i_data_len )
  *****************************************************************************/
 void input_EndStream( input_thread_t * p_input )
 {
-    int i;
-
     /* Free all programs and associated ES, and associated decoders. */
-    for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
+    while( p_input->stream.i_pgrm_number )
     {
-        /* Don't put i instead of 0 !! */
         input_DelProgram( p_input, p_input->stream.pp_programs[0] );
     }
 
     /* Free standalone ES */
-    for( i = 0; i < p_input->stream.i_es_number; i++ )
+    while( p_input->stream.i_es_number )
     {
-        /* Don't put i instead of 0 !! */
         input_DelES( p_input, p_input->stream.pp_es[0] );
     }
 }
@@ -188,16 +183,15 @@ pgrm_descriptor_t * input_AddProgram( input_thread_t * p_input,
  *****************************************************************************/
 void input_DelProgram( input_thread_t * p_input, pgrm_descriptor_t * p_pgrm )
 {
-    int i_index, i_pgrm_index;
+    int i_pgrm_index;
 
     ASSERT( p_pgrm );
 
     intf_DbgMsg("Deleting description for pgrm %d", p_pgrm->i_number);
 
     /* Free the structures that describe the es that belongs to that program */
-    for( i_index = 0; i_index < p_pgrm->i_es_number; i_index++ )
+    while( p_pgrm->i_es_number )
     {
-        /* Don't put i_index instead of 0 !! */
         input_DelES( p_input, p_pgrm->pp_es[0] );
     }
 
@@ -342,8 +336,7 @@ void input_DelES( input_thread_t * p_input, es_descriptor_t * p_es )
     /* Kill associated decoder, if any. */
     if( p_es->p_decoder_fifo != NULL )
     {
-        input_EndDecoder( p_es->p_decoder_fifo, p_es->thread_id );
-        free( p_es->p_decoder_fifo );
+        input_EndDecoder( p_input, p_es );
     }
 
     /* Remove this ES from the description of the program if it is associated to
@@ -586,6 +579,11 @@ int input_SelectES( input_thread_t * p_input, es_descriptor_t * p_es )
         break;
     }
 
+    if( p_es->thread_id == 0 )
+    {
+        return( -1 );
+    }
+
     if( p_es->p_decoder_fifo != NULL )
     {
         p_input->stream.i_selected_es_number++;