From 296783908c0723d2f8cb7aafad780ca5ba52993f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 24 Jun 2012 22:51:16 +0100 Subject: [PATCH] matroska: update for GstToc API changes --- gst/matroska/matroska-demux.c | 4 ++-- gst/matroska/matroska-mux.c | 4 ++-- gst/matroska/matroska-read-common.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 84fb8db..bfdbbb4 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -481,7 +481,7 @@ gst_matroska_demux_reset (GstElement * element) /* free chapters TOC if any */ if (demux->common.toc) { - gst_toc_free (demux->common.toc); + gst_toc_unref (demux->common.toc); demux->common.toc = NULL; } @@ -1443,7 +1443,7 @@ gst_matroska_demux_query (GstMatroskaDemux * demux, GstPad * pad, gst_query_set_toc (query, toc, 0); res = TRUE; if (!demux->common.toc) - gst_toc_free (toc); + gst_toc_unref (toc); GST_OBJECT_UNLOCK (demux); break; } diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 91d1a1c..6436206 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -813,7 +813,7 @@ gst_matroska_mux_handle_sink_event (GstCollectPads * pads, } gst_toc_setter_set_toc (GST_TOC_SETTER (mux), toc); - gst_toc_free (toc); + gst_toc_unref (toc); } gst_event_unref (event); @@ -2676,7 +2676,7 @@ gst_matroska_mux_start (GstMatroskaMux * mux) if (toc_entry != NULL) { g_list_free (toc_entry->subentries); toc_entry->subentries = NULL; - gst_toc_entry_free (toc_entry); + gst_toc_entry_unref (toc_entry); g_list_free (to_write); } } diff --git a/gst/matroska/matroska-read-common.c b/gst/matroska/matroska-read-common.c index 3a2c8f8..afe9fb7 100644 --- a/gst/matroska/matroska-read-common.c +++ b/gst/matroska/matroska-read-common.c @@ -1008,7 +1008,7 @@ gst_matroska_read_common_parse_chapter_element (GstMatroskaReadCommon * common, toc_entry->subentries = g_list_append (toc_entry->subentries, chapter_info); } else - gst_toc_entry_free (chapter_info); + gst_toc_entry_unref (chapter_info); gst_tag_list_free (titles); return ret; @@ -1076,7 +1076,7 @@ gst_matroska_read_common_parse_chapter_edition (GstMatroskaReadCommon * common, else { GST_DEBUG_OBJECT (common, "Skipping empty or hidden edition in the chapters TOC"); - gst_toc_entry_free (edition_info); + gst_toc_entry_unref (edition_info); } return ret; @@ -1123,7 +1123,7 @@ gst_matroska_read_common_parse_chapters (GstMatroskaReadCommon * common, common->toc = toc; } else - gst_toc_free (toc); + gst_toc_unref (toc); common->chapters_parsed = TRUE; -- 2.7.4