From 3fe2777b546acd9bf510d5098b3a8b4a8f2430d5 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 21 Feb 2011 12:04:09 +0100 Subject: [PATCH] Revert "oggmux,adder: Check if collectpads has been freed" This reverts commit 6d150873e8b4c23d694b0351570de323b1576d76. Depends on a core commit that was reverted. --- ext/ogg/gstoggmux.c | 4 +--- gst/adder/gstadder.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index 35e444800..c6ed67c72 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -462,9 +462,7 @@ gst_ogg_mux_release_pad (GstElement * element, GstPad * pad) ogg_mux = GST_OGG_MUX (gst_pad_get_parent (pad)); - if (ogg_mux->collect) { - gst_collect_pads_remove_pad (ogg_mux->collect, pad); - } + gst_collect_pads_remove_pad (ogg_mux->collect, pad); gst_element_remove_pad (element, pad); gst_object_unref (ogg_mux); diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c index 987adbd28..ab2abd702 100644 --- a/gst/adder/gstadder.c +++ b/gst/adder/gstadder.c @@ -991,9 +991,7 @@ gst_adder_release_pad (GstElement * element, GstPad * pad) GST_DEBUG_OBJECT (adder, "release pad %s:%s", GST_DEBUG_PAD_NAME (pad)); - if (adder->collect) { - gst_collect_pads_remove_pad (adder->collect, pad); - } + gst_collect_pads_remove_pad (adder->collect, pad); gst_element_remove_pad (element, pad); } -- 2.34.1