Skip to content

V
vlc-1.1
Commit beb3e94f authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Let input_item_AddSubItem set the playlist flags. 

It will allows proper locking of p_item.
parent 6d56066a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
modules/demux/mp4/mp4.c
View file @ beb3e94f
...@@ -368,9 +368,8 @@ static int Open( vlc_object_t * p_this ) ...@@ -368,9 +368,8 @@ static int Open( vlc_object_t * p_this )
msg_Dbg( p_demux, "detected playlist mov file (%d ref)", i_count ); msg_Dbg( p_demux, "detected playlist mov file (%d ref)", i_count );
input_thread_t * p_input = vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT ); input_thread_t *p_input = vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
input_item_t * p_current = input_GetItem( p_input ); input_item_t *p_current = input_GetItem( p_input );
p_current->i_type = ITEM_TYPE_PLAYLIST;
for( i = 0; i < i_count; i++ ) for( i = 0; i < i_count; i++ )
{ {
...@@ -415,10 +414,9 @@ static int Open( vlc_object_t * p_this ) ...@@ -415,10 +414,9 @@ static int Open( vlc_object_t * p_this )
psz_ref = psz_absolute; psz_ref = psz_absolute;
free( psz_path ); free( psz_path );
} }
input_item_t *p_input;
msg_Dbg( p_demux, "adding ref = `%s'", psz_ref ); msg_Dbg( p_demux, "adding ref = `%s'", psz_ref );
p_input = input_item_NewExt( p_demux, psz_ref, NULL, input_item_t *p_input = input_item_NewExt( p_demux, psz_ref
0, NULL, -1 ); , NULL, 0, NULL, -1 );
input_item_CopyOptions( p_current, p_input ); input_item_CopyOptions( p_current, p_input );
input_item_AddSubItem( p_current, p_input ); input_item_AddSubItem( p_current, p_input );
vlc_gc_decref( p_input ); vlc_gc_decref( p_input );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment