[vlc-commits] stream_Demux: no need to block thread cancellation

Rémi Denis-Courmont git at videolan.org
Tue Aug 21 16:38:40 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Aug 21 17:36:58 2012 +0300| [9f186108d8f263371a21c1599b3dc8e6b7fa6f1c] | committer: Rémi Denis-Courmont

stream_Demux: no need to block thread cancellation

The thread is not cancelled (ever since vlc_clone() replaced
vlc_thread_create()).

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

 src/input/stream_demux.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/src/input/stream_demux.c b/src/input/stream_demux.c
index 057ef03..859cd78 100644
--- a/src/input/stream_demux.c
+++ b/src/input/stream_demux.c
@@ -271,7 +271,6 @@ static void* DStreamThread( void *obj )
     stream_t *s = (stream_t *)obj;
     stream_sys_t *p_sys = s->p_sys;
     demux_t *p_demux;
-    int canc = vlc_savecancel();
 
     /* Create the demuxer */
     p_demux = demux_New( s, s->p_input, "", p_sys->psz_name, "", s, p_sys->out,
@@ -291,6 +290,5 @@ static void* DStreamThread( void *obj )
 
     demux_Delete( p_demux );
 
-    vlc_restorecancel( canc );
     return NULL;
 }



More information about the vlc-commits mailing list