Demuxers: do not load "meta reader" module if the input item has already been preparsed.

[vlc] / modules / demux / mpc.c

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index b61f7e04d1e24c8b7ac307d91d107700f5c09d4f..c201ed8fa2cfe77926ee129abcd5f56f692e4ac7 100644 (file)
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -189,20 +189,32 @@ static int Open( vlc_object_t * p_this )
     }
 
     /* Parse possible id3 header */
-    p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-    if( !p_demux->p_private )
-        return VLC_ENOMEM;
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+    input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( p_input )
     {
-        demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-        p_sys->p_meta = p_demux_meta->p_meta;
-        module_Unneed( p_demux, p_id3 );
-        int i;
-        for( i = 0; i < p_demux_meta->i_attachments; i++ )
-            free( p_demux_meta->attachments[i] );
-        TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
+        {
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                p_sys->p_meta = p_demux_meta->p_meta;
+                module_Unneed( p_demux, p_id3 );
+                int i;
+                for( i = 0; i < p_demux_meta->i_attachments; i++ )
+                    free( p_demux_meta->attachments[i] );
+                TAB_CLEAN( p_demux_meta->i_attachments,
+                            p_demux_meta->attachments );
+            }
+            free( p_demux->p_private );
+        }
+        vlc_object_release( p_input );
     }
-    free( p_demux->p_private );
 
     if( !p_sys->p_meta )
         p_sys->p_meta = vlc_meta_New();