summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Smith <msmith@xiph.org>2006-04-10 15:29:21 +0000
committerMichael Smith <msmith@xiph.org>2006-04-10 15:29:21 +0000
commit9b98e1fd6f3b579313ed7b8316c123fc7e345eb4 (patch)
tree2f437ff3435fc929307fe3113012905fb370857a
parent8ce75e7e780a7ef871ba8c0e74a6e080641997a2 (diff)
ext/annodex/gstcmmlutils.c: Use g_list_delete_link () instead of g_list_remove_link () so that we free the link as we...
Original commit message from CVS: * ext/annodex/gstcmmlutils.c: (gst_cmml_track_list_del_clip): Use g_list_delete_link () instead of g_list_remove_link () so that we free the link as well as the contained data.
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--ext/annodex/gstcmmlutils.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b22dee6..11cd41be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-10 Michael Smith <msmith@fluendo.com>
+
+ * ext/annodex/gstcmmlutils.c: (gst_cmml_track_list_del_clip):
+ Use g_list_delete_link () instead of g_list_remove_link () so that
+ we free the link as well as the contained data.
+
2006-04-10 Wim Taymans <wim@fluendo.com>
Patch by: Ryan Lortie (desrt) <desrt at destr dot ca>
diff --git a/common b/common
-Subproject 1783855e983a5294434673694e8a57e44980b6f
+Subproject a6710e67fd82147e32a18f1b63177583faffd49
diff --git a/ext/annodex/gstcmmlutils.c b/ext/annodex/gstcmmlutils.c
index 9e19e681..a9e561f8 100644
--- a/ext/annodex/gstcmmlutils.c
+++ b/ext/annodex/gstcmmlutils.c
@@ -287,7 +287,7 @@ gst_cmml_track_list_del_clip (GHashTable * tracks, GstCmmlTagClip * clip)
link = g_list_find (track->clips, clip);
if (link) {
g_object_unref (G_OBJECT (link->data));
- track->clips = g_list_remove_link (track->clips, link);
+ track->clips = g_list_delete_link (track->clips, link);
res = TRUE;
}
}