[vlc-commits] preparser: Always trigger an event when the preparse is skipped

Hugo Beauzée-Luyssen git at videolan.org
Fri Feb 3 12:51:51 CET 2017


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Jan 31 14:08:40 2017 +0100| [511a8150d29b723af0b9f559a064ac0516d9777a] | committer: Hugo Beauzée-Luyssen

preparser: Always trigger an event when the preparse is skipped

Previously we wouldn't trigger an event for an already preparsed media,
causing either a deadlock for libvlc_media_parse(), or undefined
behavior for libvlc user code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=511a8150d29b723af0b9f559a064ac0516d9777a
---

 src/playlist/preparser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/playlist/preparser.c b/src/playlist/preparser.c
index c56918b..dd25284 100644
--- a/src/playlist/preparser.c
+++ b/src/playlist/preparser.c
@@ -284,7 +284,7 @@ static void Preparse( playlist_preparser_t *preparser,
         input_item_SetPreparsed( p_item, true );
         input_item_SignalPreparseEnded( p_item, status );
     }
-    else if (!b_preparse)
+    else
         input_item_SignalPreparseEnded( p_item, ITEM_PREPARSE_SKIPPED );
 }
 



More information about the vlc-commits mailing list