+ input/decoder.c: detach decoder after vout_Request(...,0,0,0,0)ing

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 345c47024f3f9f844da115fd0c4052ed9492ef04..3592c0f7d7524a005c726665d9a567b3de4f14f9 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -674,8 +674,6 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
  */
 static void DeleteDecoder( decoder_t * p_dec )
 {
-    vlc_object_detach( p_dec );
-
     msg_Dbg( p_dec, "killing decoder fourcc `%4.4s', %d PES in FIFO",
              (char*)&p_dec->fmt_in.i_codec,
              p_dec->p_owner->p_fifo->i_depth );
@@ -684,7 +682,7 @@ static void DeleteDecoder( decoder_t * p_dec )
     block_FifoEmpty( p_dec->p_owner->p_fifo );
     block_FifoRelease( p_dec->p_owner->p_fifo );
 
-   /* Cleanup */
+    /* Cleanup */
     if( p_dec->p_owner->p_aout_input )
         aout_DecDelete( p_dec->p_owner->p_aout, p_dec->p_owner->p_aout_input );
 
@@ -739,6 +737,8 @@ static void DeleteDecoder( decoder_t * p_dec )
         vlc_object_destroy( p_dec->p_owner->p_packetizer );
     }
 
+    vlc_object_detach( p_dec );
+
     free( p_dec->p_owner );
 }