[0.11] gst-plugins-bad: hlsdemux: Fix merge mistake from last commit

Wim Taymans wtay at kemper.freedesktop.org
Mon Sep 26 13:32:34 PDT 2011


Module: gst-plugins-bad
Branch: 0.11
Commit: 24517ba7845cca5bdcde5d3162098076fea31600
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=24517ba7845cca5bdcde5d3162098076fea31600

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri Sep  9 12:27:57 2011 +0200

hlsdemux: Fix merge mistake from last commit

---

 gst/hls/m3u8.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/gst/hls/m3u8.c b/gst/hls/m3u8.c
index cffca7d..449b63e 100644
--- a/gst/hls/m3u8.c
+++ b/gst/hls/m3u8.c
@@ -492,7 +492,7 @@ gst_m3u8_client_get_next_fragment (GstM3U8Client * client,
     gboolean * discontinuity, const gchar ** uri, GstClockTime * duration,
     GstClockTime * timestamp)
 {
-  GList *l, *walk;
+  GList *l;
   GstM3U8MediaFile *file;
 
   g_return_val_if_fail (client != NULL, FALSE);
@@ -518,14 +518,6 @@ gst_m3u8_client_get_next_fragment (GstM3U8Client * client,
   *uri = file->uri;
   *duration = file->duration * GST_SECOND;
 
-  *timestamp = 0;
-  for (walk = client->current->files; walk; walk = walk->next) {
-    if (walk == l)
-      break;
-    *timestamp += GST_M3U8_MEDIA_FILE (walk->data)->duration;
-  }
-  *timestamp *= GST_SECOND;
-
   GST_M3U8_CLIENT_UNLOCK (client);
   return TRUE;
 }



More information about the gstreamer-commits mailing list