From c313b7e212935d5c3b988e805f9d95bbff3d8892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 6 Jan 2013 22:19:04 +0000 Subject: [PATCH] hlssink: don't leak old playlist entries when using max-files Based on patch by: Victor Gottardi https://bugzilla.gnome.org/show_bug.cgi?id=689822 --- gst/hls/gstm3u8playlist.c | 7 ++----- gst/hls/gstm3u8playlist.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gst/hls/gstm3u8playlist.c b/gst/hls/gstm3u8playlist.c index 1f9192066f..e1838b79cf 100644 --- a/gst/hls/gstm3u8playlist.c +++ b/gst/hls/gstm3u8playlist.c @@ -116,13 +116,12 @@ gst_m3u8_playlist_free (GstM3U8Playlist * playlist) } -GList * +gboolean gst_m3u8_playlist_add_entry (GstM3U8Playlist * playlist, const gchar * url, GFile * file, const gchar * title, gfloat duration, guint index, gboolean discontinuous) { GstM3U8Entry *entry; - GList *old_files = NULL; g_return_val_if_fail (playlist != NULL, FALSE); g_return_val_if_fail (url != NULL, FALSE); @@ -139,8 +138,6 @@ gst_m3u8_playlist_add_entry (GstM3U8Playlist * playlist, GstM3U8Entry *old_entry; old_entry = g_queue_pop_head (playlist->entries); - g_object_ref (old_entry->file); - old_files = g_list_prepend (old_files, old_entry->file); gst_m3u8_entry_free (old_entry); } } @@ -148,7 +145,7 @@ gst_m3u8_playlist_add_entry (GstM3U8Playlist * playlist, playlist->sequence_number = index + 1; g_queue_push_tail (playlist->entries, entry); - return old_files; + return TRUE; } static guint diff --git a/gst/hls/gstm3u8playlist.h b/gst/hls/gstm3u8playlist.h index 1e733f5706..bc81aedb60 100644 --- a/gst/hls/gstm3u8playlist.h +++ b/gst/hls/gstm3u8playlist.h @@ -59,7 +59,7 @@ GstM3U8Playlist * gst_m3u8_playlist_new (guint version, guint window_size, gboolean allow_cache); void gst_m3u8_playlist_free (GstM3U8Playlist * playlist); -GList * gst_m3u8_playlist_add_entry (GstM3U8Playlist * playlist, +gboolean gst_m3u8_playlist_add_entry (GstM3U8Playlist * playlist, const gchar * url, GFile * file, const gchar *title,