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

[vlc] / modules / codec / ffmpeg / demux.c

diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c
index 7953794f2a4a678a7fff0a4927ebe019484e97a1..10051e0a909a99fde63357df9270ff6d66b88e44 100644 (file)
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -259,27 +259,30 @@ int E_(OpenDemux)( vlc_object_t *p_this )
     input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
     if( p_input )
     {
-        p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-        if( !p_demux->p_private )
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
         {
-            vlc_object_release( p_input );
-            return VLC_ENOMEM;
-        }
-        module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
-        if( p_meta )
-        {
-            demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-            vlc_meta_Merge( input_GetItem(p_input)->p_meta,
-                    p_demux_meta->p_meta );
-            vlc_meta_Delete( p_demux_meta->p_meta );
-            module_Unneed( p_demux, p_meta );
-            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 );
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
+            if( p_meta )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                vlc_meta_Merge( input_GetItem(p_input)->p_meta,
+                        p_demux_meta->p_meta );
+                vlc_meta_Delete( p_demux_meta->p_meta );
+                module_Unneed( p_demux, p_meta );
+                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 );
     }
 
     return VLC_SUCCESS;