[vlc-devel] [RFC PATCH 1/5] decoder: fix deadlock when deleting a paused decoder

[Thomas Guillem]

---
 src/input/decoder.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 5f7cc01..daf4479 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1829,9 +1829,13 @@ void input_DecoderDelete( decoder_t *p_dec )
 
     vlc_cancel( p_owner->thread );
 
+    vlc_fifo_Lock( p_owner->p_fifo );
+    p_owner->paused = false;
+    vlc_fifo_Signal( p_owner->p_fifo );
+    vlc_fifo_Unlock( p_owner->p_fifo );
+
     /* Make sure we aren't paused/waiting/decoding anymore */
     vlc_mutex_lock( &p_owner->lock );
-    p_owner->paused = false;
     p_owner->b_waiting = false;
     p_owner->b_flushing = true;
     vlc_cond_signal( &p_owner->wait_request );
-- 
2.1.4