mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:06:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Fix merge mistake from last commit

Browse source
This commit is contained in:
Sebastian Dröge 2011-09-09 12:27:57 +02:00
parent 55e4206159
commit 24517ba784
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/hls/m3u8.c
View file

@ -492,7 +492,7 @@ gst_m3u8_client_get_next_fragment (GstM3U8Client * client,
gboolean * discontinuity, const gchar ** uri, GstClockTime * duration, gboolean * discontinuity, const gchar ** uri, GstClockTime * duration,
GstClockTime * timestamp) GstClockTime * timestamp)
{ {
GList *l, *walk; GList *l;
GstM3U8MediaFile *file; GstM3U8MediaFile *file;
g_return_val_if_fail (client != NULL, FALSE); g_return_val_if_fail (client != NULL, FALSE);
@ -518,14 +518,6 @@ gst_m3u8_client_get_next_fragment (GstM3U8Client * client,
*uri = file->uri; *uri = file->uri;
*duration = file->duration * GST_SECOND; *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); GST_M3U8_CLIENT_UNLOCK (client);
return TRUE; return TRUE;
} }