Merge branch '1.0-bugfix'

Conflicts:

	src/input/input.c

diff --combined src/input/input.c
index 1fa7b611bc0a026249abb40ce4a639fdfe035f08,01bc04ffe2a60aa5d529abcab51441bde8bff783..5723b74d1730022be9e8eacf6855ca72a32106f1
--- 1/src/input/input.c
--- 2/src/input/input.c
+++ b/src/input/input.c
@@@ -296,7 -296,7 +296,7 @@@ static void ObjectKillChildrens( input_
      i = vlc_internals( p_obj )->i_object_type;
      if( i == VLC_OBJECT_VOUT ||i == VLC_OBJECT_AOUT ||
          p_obj == VLC_OBJECT(p_input->p->p_sout) ||
 -        i == VLC_OBJECT_DECODER || i == VLC_OBJECT_PACKETIZER )
 +        i == VLC_OBJECT_DECODER )
          return;
  
      vlc_object_kill( p_obj );
@@@ -1123,7 -1123,7 +1123,7 @@@ static void InitPrograms( input_thread_
              }
              else
              {
 -                var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, NULL );
 +                var_FreeList( &val, NULL );
              }
          }
      }
@@@ -1138,7 -1138,6 +1138,6 @@@
      {
          demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
                          val.p_list );
-         var_FreeList( &val, NULL );
      }
      else
      {
@@@ -1203,9 -1202,7 +1202,9 @@@ static int Init( input_thread_t * p_inp
          i_length = 0;
      if( i_length <= 0 )
          i_length = input_item_GetDuration( p_input->p->p_item );
 -    input_SendEventTimes( p_input, 0.0, 0, i_length );
 +    input_SendEventLength( p_input, i_length );
 +
 +    input_SendEventPosition( p_input, 0.0, 0 );
  
      if( !p_input->b_preparsing )
      {
@@@ -3228,7 -3225,7 +3227,7 @@@ static void SubtitleAdd( input_thread_
              es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_DEFAULT_BY_ID, i_id );
              es_out_Control( p_input->p->p_es_out_display, ES_OUT_SET_ES_BY_ID, i_id );
          }
 -        var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
 +        var_FreeList( &list, NULL );
      }
  }