[vlc-commits] rtsp RollOverTcp : close the stream before deleting tracks.

[Sébastien Escudier]

vlc/vlc-1.1 | branch: master | Sébastien Escudier <sebastien-devel at celeos.eu> | Mon Mar 21 10:34:55 2011 +0100| [9c9d03c54c9f72d23058ba2edda2c84369c362d0] | committer: Sébastien Escudier

rtsp RollOverTcp : close the stream before deleting tracks.
Same problem than in 1d4c5a496b8b6d21c20ccb7598216195069f346e

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

 modules/demux/live555.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 1e552ab..7e91c14 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -1506,6 +1506,10 @@ static int RollOverTcp( demux_t *p_demux )
     var_SetBool( p_demux, "rtsp-tcp", true );
 
     /* We close the old RTSP session */
+    p_sys->rtsp->teardownMediaSession( *p_sys->ms );
+    Medium::close( p_sys->ms );
+    RTSPClient::close( p_sys->rtsp );
+
     for( i = 0; i < p_sys->i_track; i++ )
     {
         live_track_t *tk = p_sys->track[i];
@@ -1520,10 +1524,6 @@ static int RollOverTcp( demux_t *p_demux )
     if( p_sys->i_track ) free( p_sys->track );
     if( p_sys->p_out_asf ) stream_Delete( p_sys->p_out_asf );
 
-    p_sys->rtsp->teardownMediaSession( *p_sys->ms );
-    Medium::close( p_sys->ms );
-    RTSPClient::close( p_sys->rtsp );
-
     p_sys->ms = NULL;
     p_sys->rtsp = NULL;
     p_sys->track = NULL;