[vlc-devel] commit: Remove duplicate code. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Jun 22 08:31:51 2009 +0200| [194c86f1f94077d00270a4eda0e63a289291302a] | committer: Rémi Duraffort 

Remove duplicate code.

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

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

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index cedc42d..ce947be 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -400,35 +400,7 @@ static int  Open ( vlc_object_t *p_this )
     return VLC_SUCCESS;
 
 error:
-    for( i = 0; i < p_sys->i_track; i++ )
-    {
-        live_track_t *tk = p_sys->track[i];
-
-        if( tk->b_muxed ) stream_Delete( tk->p_out_muxed );
-        es_format_Clean( &tk->fmt );
-        free( tk->p_buffer );
-        free( tk );
-    }
-
-    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->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms );
-    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->ms ) Medium::close( p_sys->ms );
-    if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
-    if( p_sys->env ) p_sys->env->reclaim();
-    delete p_sys->scheduler;
-    free( p_sys->p_sdp );
-    free( p_sys->psz_path );
-
-    vlc_UrlClean( &p_sys->url );
-
-    free( p_sys );
+    Close( p_this );
     return i_error;
 }