[vlc-devel] commit: Destroy the playlist AFTER looking for a sout attached to it ( Rafaël Carré )

git version control git at videolan.org
Mon May 19 13:40:03 CEST 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon May 19 13:40:56 2008 +0200| [3008c478206789d38cc1935aef3fdbb1f7fa9933]

Destroy the playlist AFTER looking for a sout attached to it

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

 src/libvlc-common.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 26d58a8..76c241d 100644
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -937,10 +937,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
         p_intf = NULL;
     }
 
-    /* Free playlist */
-    msg_Dbg( p_libvlc, "removing playlist" );
-    vlc_object_release( priv->p_playlist );
-
     /* Free video outputs */
     msg_Dbg( p_libvlc, "removing all video outputs" );
     while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
@@ -985,6 +981,10 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     }
 #endif
 
+    /* Free playlist */
+    msg_Dbg( p_libvlc, "removing playlist" );
+    vlc_object_release( priv->p_playlist );
+
     /* Free interaction */
     msg_Dbg( p_libvlc, "removing interaction" );
     vlc_object_release( priv->p_interaction );




More information about the vlc-devel mailing list