[vlc-commits] decoder: flush when prerolling too

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Dec 10 10:42:05 2015 +0100| [1c83bb318ecd6520d4670f7493cba1051c3bfda1] | committer: Rémi Denis-Courmont

decoder: flush when prerolling too

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.

Conflicts:
    src/input/decoder.c

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 src/input/decoder.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index cd7891b..4e190da 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1366,14 +1366,6 @@ static void DecoderProcessFlush( decoder_t *p_dec )
     if( p_dec->b_error )
         return;
 
-    vlc_mutex_lock( &p_owner->lock );
-    if ( p_owner->i_preroll_end == INT64_MAX )
-    {
-        vlc_mutex_unlock( &p_owner->lock );
-        return;
-    }
-    vlc_mutex_unlock( &p_owner->lock );
-
     if( p_packetizer != NULL && p_packetizer->pf_flush != NULL )
         p_packetizer->pf_flush( p_packetizer );