[vlc-commits] hds: free mutexes and cond variables on all streams

Antti Ajanki git at videolan.org
Fri Nov 28 07:32:51 CET 2014


vlc | branch: master | Antti Ajanki <antti.ajanki at iki.fi> | Thu Nov 27 18:37:43 2014 +0000| [2897e2b49b8f0fd46acd3a5b1c99485891300ccd] | committer: Tristan Matthews

hds: free mutexes and cond variables on all streams

Signed-off-by: Tristan Matthews <tmatth at videolan.org>

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

 modules/stream_filter/hds/hds.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/stream_filter/hds/hds.c b/modules/stream_filter/hds/hds.c
index 7e3c017..5179bf5 100644
--- a/modules/stream_filter/hds/hds.c
+++ b/modules/stream_filter/hds/hds.c
@@ -1453,6 +1453,8 @@ static void hds_free( hds_stream_t *p_stream )
 
     FREENULL( p_stream->abst_url );
 
+    cleanup_threading( p_stream );
+
     FREENULL( p_stream->url );
     FREENULL( p_stream->movie_id );
     for( int i = 0; i < p_stream->server_entry_count; i++ )
@@ -1563,11 +1565,6 @@ static void Close( vlc_object_t *p_this )
 
     vlc_join( p_sys->dl_thread, NULL );
 
-    if (stream)
-    {
-        cleanup_threading( stream );
-    }
-
     if( p_sys->live )
     {
         vlc_join( p_sys->live_thread, NULL );



More information about the vlc-commits mailing list