hls: use gst api for timestamps instead of the (wrong) api from a too new glib

Conflicts:

	gst/hls/gstfragment.c

diff --git a/gst/hls/gstfragment.c b/gst/hls/gstfragment.c
index e21c14010b8bbc9be3593548afe737441875c57d..71c3e2b075be76d2efc3378a452fc86d47ac649f 100644 (file)
--- a/gst/hls/gstfragment.c
+++ b/gst/hls/gstfragment.c
@@ -159,7 +159,7 @@ gst_fragment_init (GstFragment * fragment)
 
   g_mutex_init (&fragment->priv->lock);
   priv->buffer = NULL;
-  fragment->download_start_time = g_get_real_time ();
+  fragment->download_start_time = gst_util_get_timestamp ();
   fragment->start_time = 0;
   fragment->stop_time = 0;
   fragment->index = 0;

diff --git a/gst/hls/gsturidownloader.c b/gst/hls/gsturidownloader.c
index bd59075c05f92f889512709c177282f19b5d3d24..68eefad9bff1cd6a8e861a21d704d80d854febdf 100644 (file)
--- a/gst/hls/gsturidownloader.c
+++ b/gst/hls/gsturidownloader.c
@@ -163,7 +163,8 @@ gst_uri_downloader_sink_event (GstPad * pad, GstObject * parent,
       if (downloader->priv->download != NULL) {
         /* signal we have fetched the URI */
         downloader->priv->download->completed = TRUE;
-        downloader->priv->download->download_stop_time = g_get_real_time ();
+        downloader->priv->download->download_stop_time =
+            gst_util_get_timestamp ();
         GST_OBJECT_UNLOCK (downloader);
         GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
         g_cond_signal (&downloader->priv->cond);