[vlc-commits] commit: live555 : remove timeout thread before closing rtsp session ( Sébastien Escudier )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Thu Oct 21 14:57:56 2010 +0200| [5ac3980fb273fdc8dddacf96c61d03ad3f3f4da7] | committer: Sébastien Escudier 

live555 : remove timeout thread before closing rtsp session

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

 modules/demux/live555.cpp |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index b173dd5..c83200c 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -428,6 +428,13 @@ static void Close( vlc_object_t *p_this )
     demux_t *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
+    if( p_sys->p_timeout )
+    {
+        vlc_cancel( p_sys->p_timeout->handle );
+        vlc_join( p_sys->p_timeout->handle, NULL );
+        free( p_sys->p_timeout );
+    }
+
     if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms );
     if( p_sys->ms ) Medium::close( p_sys->ms );
     if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
@@ -445,12 +452,6 @@ static void Close( vlc_object_t *p_this )
 
     if( p_sys->i_track ) free( p_sys->track );
     if( p_sys->p_out_asf ) stream_Delete( p_sys->p_out_asf );
-    if( p_sys->p_timeout )
-    {
-        vlc_cancel( p_sys->p_timeout->handle );
-        vlc_join( p_sys->p_timeout->handle, NULL );
-        free( p_sys->p_timeout );
-    }
     delete p_sys->scheduler;
     free( p_sys->p_sdp );
     free( p_sys->psz_path );