[vlc-devel] [RFC PATCH] decoder: flush when prerolling too

Thomas Guillem thomas at gllm.fr
Thu Dec 10 10:42:05 CET 2015


This fixes a possible deadlock when seeking paused at the end of the video.
Indeed, in that case, prerolling won't end and the decoder won't be flushed if
we seek at the end again.
---
 src/input/decoder.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 2b7aaf4..07092ee 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1283,9 +1283,6 @@ static void DecoderProcessFlush( decoder_t *p_dec )
     if( p_dec->b_error )
         return;
 
-    if ( p_owner->i_preroll_end == INT64_MAX )
-        return;
-
     if( p_packetizer != NULL && p_packetizer->pf_flush != NULL )
         p_packetizer->pf_flush( p_packetizer );
 
-- 
2.1.4



More information about the vlc-devel mailing list