git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c74cf3
)
rtmp: kill the thread if the active connect failed..
author
Rémi Duraffort
<ivoire@videolan.org>
Sat, 4 Jul 2009 08:31:08 +0000
(10:31 +0200)
committer
Rémi Duraffort
<ivoire@videolan.org>
Sat, 4 Jul 2009 08:31:08 +0000
(10:31 +0200)
modules/access/rtmp/access.c
patch
|
blob
|
history
diff --git
a/modules/access/rtmp/access.c
b/modules/access/rtmp/access.c
index
b32dace
..
53647ba
100644
(file)
--- a/
modules/access/rtmp/access.c
+++ b/
modules/access/rtmp/access.c
@@
-222,6
+222,10
@@
static int Open( vlc_object_t *p_this )
if( rtmp_connect_active( p_sys->p_thread ) < 0 )
{
msg_Err( p_access, "connect active failed");
if( rtmp_connect_active( p_sys->p_thread ) < 0 )
{
msg_Err( p_access, "connect active failed");
+ /* Kill the running thread */
+ vlc_object_kill( p_sys->p_thread );
+ block_FifoWake( p_sys->p_thread->p_fifo_input );
+ vlc_thread_join( p_sys->p_thread );
goto error2;
}
}
goto error2;
}
}