vlc/vlc-3.0 | branch: master | Francois Cartegnie <[email protected]> | Tue Aug 21 13:47:10 2018 +0200| [14bb61d7abb0bad568b0d071bfbdc3e87c0c2e67] | committer: Francois Cartegnie
access: live555: don't send keepalive over rtcp breaks data flow http://lists.live555.com/pipermail/live-devel/2009-January/010108.html (cherry picked from commit 393030d22c3709f5a85715d6a850a01cd08db856) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=14bb61d7abb0bad568b0d071bfbdc3e87c0c2e67 --- modules/access/live555.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp index c81cda52d1..d59a633d3c 100644 --- a/modules/access/live555.cpp +++ b/modules/access/live555.cpp @@ -2241,6 +2241,9 @@ static void TimeoutPrevention( void *p_data ) demux_sys_t *p_sys = p_demux->p_sys; char *bye = NULL; + if( var_GetBool( p_demux, "rtsp-tcp" ) ) + return; + /* Protect Live555 from us calling their functions simultaneously with Demux() or Control() */ vlc_mutex_locker locker(&p_sys->timeout_mutex); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
