diff options
author | Stefan Sauer <ensonic@users.sf.net> | 2012-05-15 15:46:28 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-05-15 16:08:00 +0200 |
commit | 5b39799cf0e782e5a1da023aed6d5ad09482acd6 (patch) | |
tree | 7f08055f2443e7b3939b3100c8d1c33c12079508 | |
parent | 74c73eba05f9704ae8888c8d1519010f7a27d789 (diff) | |
download | gstreamer-plugins-bad-5b39799cf0e782e5a1da023aed6d5ad09482acd6.tar.gz |
hls: use gst api for timestamps instead of the (wrong) api from a too new glib
Conflicts:
gst/hls/gstfragment.c
-rw-r--r-- | gst/hls/gstfragment.c | 2 | ||||
-rw-r--r-- | gst/hls/gsturidownloader.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gst/hls/gstfragment.c b/gst/hls/gstfragment.c index e21c14010..71c3e2b07 100644 --- 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 bd59075c0..68eefad9b 100644 --- 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); |