libvlccore: push threads cancellation down vlc_thread_create

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 0544da0035ecc22e94446ac0aa2a30d332986e51..42756890fd16e1327a83af3ba14799a1e00ce517 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -573,12 +573,12 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
  * The decoding main loop
  *
  * \param p_dec the decoder
- * \return 0
  */
 static void* DecoderThread( vlc_object_t *p_this )
 {
     decoder_t * p_dec = (decoder_t *)p_this;
     block_t *p_block;
+    int canc = vlc_savecancel ();
 
     /* The decoder's main loop */
     while( !p_dec->b_die && !p_dec->b_error )
@@ -604,7 +604,7 @@ static void* DecoderThread( vlc_object_t *p_this )
     /* We do it here because of the dll loader that wants close() in the
      * same thread than open()/decode() */
     module_Unneed( p_dec, p_dec->p_module );
-
+    vlc_restorecancel (canc);
     return NULL;
 }