Changeset aeaf0da4ea02c39b49bc49493a8a6c2de3dec411

Timestamp:

28/05/08 02:46:01 (5 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1211935561 +0200

git-parent:

[d682e91e10f9ceabfb52385e0956e1fabba9928c]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1211935561 +0200

Message:

video_output: Make sure we check p_vout->b_die inside the object lock.

Files:

• src/video_output/video_output.c (modified) (6 diffs)

src/video_output/video_output.c

@@ -763 +763 @@
-        return;
-
+    vlc_object_lock( p_vout );
+
-    if( p_vout->b_title_show )
-        DisplayTitleOnOSD( p_vout );
@@ -770 +772 @@
-     * initialization
-     */
-!p_vout->b_die
+vlc_object_alive( p_vout )
-    {
-        /* Initialize loop variables */
@@ -1092 +1094 @@
-        vlc_mutex_unlock( &p_vout->change_lock );
-
+        vlc_object_unlock( p_vout );
+
-        /* Sleep a while or until a given date */
-        if( display_date != 0 )
@@ -1109 +1113 @@
-        /* On awakening, take back lock and send immediately picture
-         * to display. */
+        vlc_object_lock( p_vout );
+        /* Note: vlc_object_alive() could be false here, and we
+         * could be dead */
-        vlc_mutex_lock( &p_vout->change_lock );
-
@@ -1202 +1209 @@
-    }
-
+
-    if( p_input )
-    {
@@ -1217 +1225 @@
-    /* End of thread */
-    EndThread( p_vout );
+    vlc_object_unlock( p_vout );
-}
-