]> git.sesse.net Git - vlc/commitdiff
Merge branch '1.0-bugfix'
authorRémi Duraffort <ivoire@videolan.org>
Wed, 20 May 2009 19:53:35 +0000 (21:53 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Wed, 20 May 2009 19:53:35 +0000 (21:53 +0200)
Conflicts:

src/control/media_player.c

1  2 
src/control/media_player.c

index 48b4b76e521d8370435facd623ed465931a950eb,63ef8f03bc6da63154e4898a566c545231640675..ce4cd0b1a8055760e8c2992e391dc17a45edf375
@@@ -1176,7 -1242,8 +1176,8 @@@ libvlc_track_description_t 
  
      if( val_list.p_list->i_count <= 0 ) /* no tracks */
      {
 -        var_Change( p_input, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list);
 +        var_FreeList( &val_list, &text_list);
+         vlc_object_release( p_input );
          return NULL;
      }