[vlc-commits] decoder: fix re-used vout being in a canceled state

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Mar 15 17:36:19 2017 +0100| [e6b5741b2d135669dde6692eaab0530b8609b205] | committer: Thomas Guillem

decoder: fix re-used vout being in a canceled state

Fixes #18105

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

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

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 91a6f37..8a223da 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1754,7 +1754,10 @@ static void DeleteDecoder( decoder_t * p_dec )
     }
     if( p_owner->p_vout )
     {
-        /* */
+        /* Reset the cancel state that was set before joining the decoder
+         * thread */
+        vout_Cancel( p_owner->p_vout, false );
+
         input_resource_RequestVout( p_owner->p_resource, p_owner->p_vout, NULL,
                                     0, true );
         if( p_owner->p_input != NULL )