- p_sys->p_meta = p_meta;
- }
- else if( p_meta )
- {
- vlc_meta_Merge( p_sys->p_meta, p_meta );
- vlc_meta_Delete( p_meta );
+ 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;
+ vlc_meta_t *p_meta = p_demux_meta->p_meta;
+
+ if( !p_sys->p_meta )
+ {
+ p_sys->p_meta = p_meta;
+ }
+ else if( p_meta )
+ {
+ vlc_meta_Merge( p_sys->p_meta, p_meta );
+ vlc_meta_Delete( p_meta );
+ }
+ p_demux->p_private = NULL;
+ module_Unneed( p_demux, p_id3 );
+ int i;
+ for( i = 0; i < p_demux_meta->i_attachments; i++ )
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_sys->i_attachments, p_sys->attachments,
+ p_demux_meta->attachments[p_demux_meta->i_attachments] );
+ TAB_CLEAN( p_demux_meta->i_attachments,
+ p_demux_meta->attachments );
+ }
+ free( p_demux->p_private );