demuxers: remove the need for input_thread_t by using the new "meta-preparsed" input...

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

diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c
index 10051e0a909a99fde63357df9270ff6d66b88e44..3ae0570b890b8cb60b45d9d692fb5300414dd802 100644 (file)
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -30,7 +30,6 @@
 #include <vlc_demux.h>
 #include <vlc_stream.h>
 #include <vlc_meta.h>
-#include <vlc_input.h>
 
 /* ffmpeg header */
 #ifdef HAVE_FFMPEG_AVFORMAT_H
@@ -256,35 +255,6 @@ int E_(OpenDemux)( vlc_object_t *p_this )
              ( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE ) ?
              p_sys->ic->duration * 1000000 / AV_TIME_BASE : -1 );
 
-    input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
-    if( p_input )
-    {
-        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;
-            }
-            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 );
-    }
-
     return VLC_SUCCESS;
 }