mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 15:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.10'

Browse source 
Conflicts:
	gst/rtsp-server/rtsp-session-pool.c
This commit is contained in:
Sebastian Dröge 2012-03-29 15:12:21 +02:00
parent ed1642b997 1f442d45b6
commit e9ef6f6254
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/rtsp-server/rtsp-session-pool.c
View file

@ -476,8 +476,11 @@ collect_timeout (gchar * sessionid, GstRTSPSession * sess, GstPoolSource * psrc)
{
gint timeout;
GTimeVal now;
gint64 tmp;
g_get_current_time (&now);
tmp = g_source_get_time ((GSource *) psrc);
now.tv_sec = tmp / G_USEC_PER_SEC;
now.tv_usec = tmp % G_USEC_PER_SEC;
timeout = gst_rtsp_session_next_timeout (sess, &now);
GST_INFO ("%p: next timeout: %d", sess, timeout);