don't copy 'meta-file' option to inputs

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 8d3b94f40ff5c576ac115ee075bf4244449e9bb8..f602c51077552ea20ee195d78d2d480740adb79e 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -106,6 +106,11 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
     for( i = 0 ; i< p_parent->i_options; i++ )
     {
         char *psz_option= strdup( p_parent->ppsz_options[i] );
+        if( !strcmp( psz_option, "meta-file" ) )
+        {
+            free( psz_option );
+            continue;
+        }
         p_child->i_options++;
         p_child->ppsz_options = (char **)realloc( p_child->ppsz_options,
                                                   p_child->i_options *

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index bdd6b377def09f454f797eab8b6226876c4c69e9..be675b0a11bfeae0b417e06706918ce3275cacbe 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -97,14 +97,6 @@ static void input_item_subitem_added( const vlc_event_t * p_event,
     playlist_t *p_playlist = user_data;
     input_item_t *p_item = p_event->u.input_item_subitem_added.p_new_child;
 
-    /* The media library input has one and only one option: "meta-file"
-     * So we remove that unneeded option. */
-    if( p_item->i_options == 1 )
-    {
-        free( p_item->ppsz_options[0] );
-        p_item->i_options = 0;
-    }
-
     playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END,
             VLC_FALSE, VLC_FALSE );
 }