[vlc-devel] commit: libvlccore: Don't do vout destruction before destroying playlist. ( Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sun Jun  1 00:19:11 2008 +0200| [a717f3bb306a96e04a1ef0993a4f379d307ffa49]

libvlccore: Don't do vout destruction before destroying playlist.

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

 src/libvlc.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index 720dee9..90e2a79 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -938,15 +938,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
         vlc_object_release( p_intf ); /* for vlc_object_find() */
     }
 
-    /* Free video outputs */
-    msg_Dbg( p_libvlc, "removing all video outputs" );
-    while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
-    {
-        vlc_object_detach( p_vout );
-        vlc_object_release( p_vout );
-        vout_Destroy( p_vout );
-    }
-
 #ifdef ENABLE_SOUT
     playlist_t         * p_playlist;
     sout_instance_t    * p_sout;
@@ -981,6 +972,15 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     msg_Dbg( p_libvlc, "removing interaction" );
     vlc_object_release( priv->p_interaction );
 
+    /* Free video outputs */
+    msg_Dbg( p_libvlc, "removing all video outputs" );
+    while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
+    {
+        vlc_object_detach( p_vout );
+        vlc_object_release( p_vout );
+        vout_Destroy( p_vout );
+    }
+
     stats_TimersDumpAll( p_libvlc );
     stats_TimersCleanAll( p_libvlc );