mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-06 10:42:22 +00:00
Merge remote-tracking branch 'origin/0.10'
Conflicts: gst/rtsp-server/rtsp-session-pool.c
This commit is contained in:
commit
e9ef6f6254
1 changed files with 4 additions and 1 deletions
|
@ -476,8 +476,11 @@ collect_timeout (gchar * sessionid, GstRTSPSession * sess, GstPoolSource * psrc)
|
||||||
{
|
{
|
||||||
gint timeout;
|
gint timeout;
|
||||||
GTimeVal now;
|
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);
|
timeout = gst_rtsp_session_next_timeout (sess, &now);
|
||||||
GST_INFO ("%p: next timeout: %d", sess, timeout);
|
GST_INFO ("%p: next timeout: %d", sess, timeout);
|
||||||
|
|
Loading…
Reference in a new issue