vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jul 10 23:12:20 2011 +0300| [c886aee90abfd14bcb76732d5151bc35933f0bbd] | committer: Rémi Denis-Courmont
Mark non-file input items as preparsed even if they're not Without this, libvlc_media_parse() will deadlock on non-file items. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c886aee90abfd14bcb76732d5151bc35933f0bbd --- src/playlist/preparser.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/playlist/preparser.c b/src/playlist/preparser.c index dfd955a..232d798 100644 --- a/src/playlist/preparser.c +++ b/src/playlist/preparser.c @@ -126,7 +126,10 @@ static void Preparse( playlist_t *p_playlist, input_item_t *p_item ) vlc_mutex_unlock( &p_item->lock ); if( i_type != ITEM_TYPE_FILE ) + { + input_item_SetPreparsed( p_item, true ); return; + } stats_TimerStart( p_playlist, "Preparse run", STATS_TIMER_PREPARSE ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
