]> git.sesse.net Git - vlc/commitdiff
Create and copy the meta array only if the copied item does have one.
authorRémi Duraffort <ivoire@videolan.org>
Sun, 19 Jun 2011 09:41:56 +0000 (11:41 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Sun, 19 Jun 2011 09:42:24 +0000 (11:42 +0200)
src/input/item.c

index de510bcc24acdd10c01c6aff2570e6a804e60fdf..ccd7013c12f3a12302fc0a67a27209fb6d2c6de7 100644 (file)
@@ -896,8 +896,12 @@ input_item_t *input_item_Copy( vlc_object_t *p_obj, input_item_t *p_input )
                                   p_input->ppsz_options[i],
                                   p_input->optflagv[i] );
         }
-        p_new_input->p_meta = vlc_meta_New();
-        vlc_meta_Merge( p_new_input->p_meta, p_input->p_meta );
+
+        if( p_input->p_meta )
+        {
+            p_new_input->p_meta = vlc_meta_New();
+            vlc_meta_Merge( p_new_input->p_meta, p_input->p_meta );
+        }
     }
 
     vlc_mutex_unlock( &p_input->lock );