* src/input/input_programs.c: small bug fix.

* src/misc/variables.c: compilation fix for MSVC.

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 25e4bab97818e28ae52d5f8ea246c7ff15333637..77ee512fc55e694b0a886573ae9410fc49796dd6 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.109 2003/05/11 18:40:11 hartman Exp $
+ * $Id: input_programs.c,v 1.110 2003/05/11 18:43:19 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -635,6 +635,7 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
         text.psz_string = p_es->psz_desc;
         var_Change( p_input, psz_var, VLC_VAR_ADDCHOICE, &val, &text );
     }
+    else p_es->psz_desc = NULL;
 
     return p_es;
 }

diff --git a/src/misc/variables.c b/src/misc/variables.c
index ff32dfc54afdb343cec1f0176c4d72c09e3daf8b..8b037cf8283eb7641e7458973194b5dc3597b7ad 100644 (file)
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -2,7 +2,7 @@
  * variables.c: routines for object variables handling
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: variables.c,v 1.23 2003/05/05 15:21:27 sigmunau Exp $
+ * $Id: variables.c,v 1.24 2003/05/11 18:43:19 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -408,7 +408,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
             INSERT_ELEM( p_var->choices.p_values, p_var->choices.i_count,
                          i, *p_val );
             INSERT_ELEM( p_var->choices_text.p_values,
-                         p_var->choices_text.i_count, i, (vlc_value_t)0 );
+                         p_var->choices_text.i_count, i, *p_val );
             p_var->pf_dup( &p_var->choices.p_values[i] );
             p_var->choices_text.p_values[i].psz_string =
                 ( p_val2 && p_val2->psz_string ) ?