]> git.sesse.net Git - vlc/commitdiff
rtsp RollOverTcp : close the stream before deleting tracks.
authorSébastien Escudier <sebastien-devel@celeos.eu>
Mon, 21 Mar 2011 09:34:55 +0000 (10:34 +0100)
committerSébastien Escudier <sebastien-devel@celeos.eu>
Mon, 21 Mar 2011 09:34:55 +0000 (10:34 +0100)
Same problem than in 1d4c5a496b8b6d21c20ccb7598216195069f346e

modules/demux/live555.cpp

index 723a02df678110c5722cb7856d0a5c86689cdb16..9bf7359f42607c6f5cf4f213aff27d66febc3cff 100644 (file)
@@ -1575,6 +1575,10 @@ static int RollOverTcp( demux_t *p_demux )
     var_SetBool( p_demux, "rtsp-tcp", true );
 
     /* We close the old RTSP session */
+    p_sys->rtsp->sendTeardownCommand( *p_sys->ms, NULL );
+    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];
@@ -1589,10 +1593,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->sendTeardownCommand( *p_sys->ms, NULL );
-    Medium::close( p_sys->ms );
-    RTSPClient::close( p_sys->rtsp );
-
     p_sys->ms = NULL;
     p_sys->rtsp = NULL;
     p_sys->track = NULL;