[vlc-commits] decoder: don´t touch pause on exit

Thomas Guillem git at videolan.org
Fri Nov 6 22:50:03 CET 2015


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Nov  6 17:33:47 2015 +0200| [f0ae37f49e0ebf917b80e84de3cf371c41f77225] | committer: Rémi Denis-Courmont

decoder: don´t touch pause on exit

The paused flag is no longer protected by the owner lock (the FIFO lock
instead), and it is no longer useful to clear it at exit.

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

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

 src/input/decoder.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 5f7cc01..c78e141 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1829,9 +1829,8 @@ void input_DecoderDelete( decoder_t *p_dec )
 
     vlc_cancel( p_owner->thread );
 
-    /* Make sure we aren't paused/waiting/decoding anymore */
+    /* Make sure we aren't 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 );



More information about the vlc-commits mailing list