* modules/demux/mpeg/ts.c: compiler warning fix.

* src/input/input_programs.c: a "Disable" choice is added by default to "audio-es", "video-es" and "spu-es".

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 285546374487534d5736ed7ee954a5599eaa588b..2758c77f207e587739e30d7c95a2485f314ff612 100644 (file)
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: ts.c,v 1.21 2003/05/05 22:23:36 gbazin Exp $
+ * $Id: ts.c,v 1.22 2003/05/05 22:48:22 gbazin Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -1369,6 +1369,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
                 default:
                     i_fourcc = 0;
                     i_cat = UNKNOWN_ES;
+                    i_stream_id = 0;
             }
 
             /* Add this ES */

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 3fac781c794972092019fbf23a6bcc3c8adfa739..d89130e9f1515ac26b7b6f6cb3fd71104c313874 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-2002 VideoLAN
- * $Id: input_programs.c,v 1.106 2003/05/05 22:23:42 gbazin Exp $
+ * $Id: input_programs.c,v 1.107 2003/05/05 22:48:23 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -56,7 +56,7 @@ static int ESCallback( vlc_object_t *, char const *,
  *****************************************************************************/
 int input_InitStream( input_thread_t * p_input, size_t i_data_len )
 {
-    vlc_value_t text;
+    vlc_value_t val, text;
 
     p_input->stream.i_stream_id = 0;
 
@@ -108,6 +108,11 @@ int input_InitStream( input_thread_t * p_input, size_t i_data_len )
     text.psz_string = _("Subtitle track");
     var_Change( p_input, "spu-es", VLC_VAR_SETTEXT, &text, NULL );
 
+    val.i_int = -1; text.psz_string = _("Disable");
+    var_Change( p_input, "video-es", VLC_VAR_ADDCHOICE, &val, &text );
+    var_Change( p_input, "audio-es", VLC_VAR_ADDCHOICE, &val, &text );
+    var_Change( p_input, "spu-es", VLC_VAR_ADDCHOICE, &val, &text );
+
     var_AddCallback( p_input, "program", ProgramCallback, NULL );
     var_AddCallback( p_input, "title", TitleCallback, NULL );
     var_AddCallback( p_input, "chapter", ChapterCallback, NULL );