vlc | branch: master | Jean-Paul Saman <[email protected]> | Tue Feb 22 15:27:07 2011 +0100| [40fb9a1c68d1134a8226a797eee64852e2e647dd] | committer: Jean-Paul Saman
stream_filter/httplive.c: Do not allow cancellation of hls_Thread(). Do not allow cancellation of hls_Thread(). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40fb9a1c68d1134a8226a797eee64852e2e647dd --- modules/stream_filter/httplive.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c index c2f67ed..a165101 100644 --- a/modules/stream_filter/httplive.c +++ b/modules/stream_filter/httplive.c @@ -1121,6 +1121,8 @@ static void* hls_Thread(void *p_this) stream_t *s = (stream_t *)p_this; stream_sys_t *p_sys = s->p_sys; + int canc = vlc_savecancel(); + while (vlc_object_alive(s)) { hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->download.stream); @@ -1213,6 +1215,7 @@ static void* hls_Thread(void *p_this) vlc_mutex_unlock(&p_sys->download.lock_wait); } + vlc_restorecancel(canc); return NULL; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
