From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Thu, 29 Mar 2012 13:12:21 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/0.10'
X-Git-Tag: 1.19.3~495^2~1387
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9ef6f6254f0c9a1e6e7008e93a8c03a47fa675b;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	gst/rtsp-server/rtsp-session-pool.c
---

e9ef6f6254f0c9a1e6e7008e93a8c03a47fa675b
diff --cc gst/rtsp-server/rtsp-session-pool.c
index 1d00dc4,da0c1c3..c1619c7
--- a/gst/rtsp-server/rtsp-session-pool.c
+++ b/gst/rtsp-server/rtsp-session-pool.c
@@@ -476,8 -476,15 +476,11 @@@ collect_timeout (gchar * sessionid, Gst
  {
    gint timeout;
    GTimeVal now;
 -#if GLIB_CHECK_VERSION(2,28,0)
+   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;
 -#else
 -  g_source_get_current_time ((GSource *) psrc, &now);
 -#endif
  
    timeout = gst_rtsp_session_next_timeout (sess, &now);
    GST_INFO ("%p: next timeout: %d", sess, timeout);