* ./src/interface/main.c: tidied the help output code.

[vlc] / src / input / input_dec.c

diff --git a/src/input/input_dec.c b/src/input/input_dec.c
index 787a3d88db665df69d399262be90e22eea1a99e0..71675b8a20bb09496aec32f91f2d0a1851d92ec6 100644 (file)
--- a/src/input/input_dec.c
+++ b/src/input/input_dec.c
@@ -2,7 +2,7 @@
  * input_dec.c: Functions for the management of decoders
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_dec.c,v 1.28 2002/02/24 20:51:10 gbazin Exp $
+ * $Id: input_dec.c,v 1.32 2002/04/23 14:16:20 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -50,11 +50,11 @@ vlc_thread_t input_RunDecoder( input_thread_t * p_input,
 
     if( p_es->i_type == MPEG1_AUDIO_ES || p_es->i_type == MPEG2_AUDIO_ES )
     {
-        psz_plugin = config_GetPszVariable( ADEC_MPEG_VAR );
+        psz_plugin = config_GetPszVariable( "mpeg-adec" );
     }
     if( p_es->i_type == AC3_AUDIO_ES )
     {
-        psz_plugin = config_GetPszVariable( ADEC_AC3_VAR );
+        psz_plugin = config_GetPszVariable( "ac3-adec" );
     }
 
     /* Get a suitable module */
@@ -247,6 +247,8 @@ static decoder_config_t * CreateDecoderConfig( input_thread_t * p_input,
 
     p_config->i_id = p_es->i_id;
     p_config->i_type = p_es->i_type;
+    p_config->p_demux_data = p_es->p_demux_data;
+    
     p_config->p_stream_ctrl = &p_input->stream.control;
 
     p_config->p_decoder_fifo->p_first = NULL;
@@ -254,7 +256,6 @@ static decoder_config_t * CreateDecoderConfig( input_thread_t * p_input,
     p_config->p_decoder_fifo->i_depth = 0;
     p_config->p_decoder_fifo->b_die = p_config->p_decoder_fifo->b_error = 0;
     p_config->p_decoder_fifo->p_packets_mgt = p_input->p_method_data;
-    p_config->p_decoder_fifo->pf_delete_pes = p_input->pf_delete_pes;
 
     return p_config;
 }
@@ -268,9 +269,8 @@ static void DeleteDecoderConfig( decoder_config_t * p_config )
                   p_config->i_id, p_config->i_type,
                   p_config->p_decoder_fifo->i_depth );
     /* Free all packets still in the decoder fifo. */
-    p_config->p_decoder_fifo->pf_delete_pes(
-                        p_config->p_decoder_fifo->p_packets_mgt,
-                        p_config->p_decoder_fifo->p_first );
+    input_DeletePES( p_config->p_decoder_fifo->p_packets_mgt,
+                     p_config->p_decoder_fifo->p_first );
 
     /* Destroy the lock and cond */
     vlc_cond_destroy( &p_config->p_decoder_fifo->data_wait );