vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jun 13 15:32:59 2018 +0200| [a15728e4c4f383c03fbfa73927a9ccb5e69932dd] | committer: Steve Lhomme
sout:rtsp: explictly tell when we are disarming the timer > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a15728e4c4f383c03fbfa73927a9ccb5e69932dd --- modules/stream_out/rtsp.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c index 7d838e0cff..5578b548a5 100644 --- a/modules/stream_out/rtsp.c +++ b/modules/stream_out/rtsp.c @@ -310,8 +310,14 @@ static void RtspUpdateTimer( rtsp_stream_t *rtsp ) timeout = rtsp->sessionv[i]->last_seen; } if (timeout != 0) + { timeout += vlc_tick_from_sec( rtsp->timeout ); - vlc_timer_schedule(rtsp->timer, true, timeout, VLC_TIMER_FIRE_ONCE); + vlc_timer_schedule(rtsp->timer, true, timeout, VLC_TIMER_FIRE_ONCE); + } + else + { + vlc_timer_disarm(rtsp->timer); + } } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
