* ./src/video_output/video_output.c, modules/*: factorized video output

[vlc] / modules / codec / mpeg_video / parser.c

diff --git a/modules/codec/mpeg_video/parser.c b/modules/codec/mpeg_video/parser.c
index 617fe2c0ae44b9655ff9b89792dbe4d5d2f0d548..5bbadcea332595f5628418011087fff30fa7a7ff 100644 (file)
--- a/modules/codec/mpeg_video/parser.c
+++ b/modules/codec/mpeg_video/parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: parser.c,v 1.7 2002/11/20 13:37:35 sam Exp $
+ * $Id: parser.c,v 1.8 2002/11/28 17:35:00 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -299,28 +299,23 @@ static void EndThread( vpar_thread_t *p_vpar )
     times( &cpu_usage );
 #endif
 
-    if( p_vpar->p_vout != NULL )
+    /* Release used video buffers. */
+    if( p_vpar->sequence.p_forward != NULL )
     {
-        /* Release used video buffers. */
-        if( p_vpar->sequence.p_forward != NULL )
-        {
-            vout_UnlinkPicture( p_vpar->p_vout, p_vpar->sequence.p_forward );
-        }
-        if( p_vpar->sequence.p_backward != NULL )
-        {
-            vout_DatePicture( p_vpar->p_vout, p_vpar->sequence.p_backward,
-                              vpar_SynchroDate( p_vpar ) );
-            vout_UnlinkPicture( p_vpar->p_vout, p_vpar->sequence.p_backward );
-        }
-        if( p_vpar->picture.p_picture != NULL )
-        {
-            vout_DestroyPicture( p_vpar->p_vout, p_vpar->picture.p_picture );
-        }
-
-        /* We are about to die. Reattach video output to p_vlc. */
-        vlc_object_detach( p_vpar->p_vout );
-        vlc_object_attach( p_vpar->p_vout, p_vpar->p_fifo->p_vlc );
+        vout_UnlinkPicture( p_vpar->p_vout, p_vpar->sequence.p_forward );
+    }
+    if( p_vpar->sequence.p_backward != NULL )
+    {
+        vout_DatePicture( p_vpar->p_vout, p_vpar->sequence.p_backward,
+                          vpar_SynchroDate( p_vpar ) );
+        vout_UnlinkPicture( p_vpar->p_vout, p_vpar->sequence.p_backward );
     }
+    if( p_vpar->picture.p_picture != NULL )
+    {
+        vout_DestroyPicture( p_vpar->p_vout, p_vpar->picture.p_picture );
+    }
+
+    vout_Request( p_vpar->p_fifo, p_vpar->p_vout, 0, 0, 0, 0 );
 
     msg_Dbg( p_vpar->p_fifo, "%d loops among %d sequence(s)",
              p_vpar->c_loops, p_vpar->c_sequences );