From 715529c9632353097157433e2649cf1c2e69a9e5 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 21 Feb 2011 12:14:59 +0100 Subject: [PATCH] Revert "Check that collectpads exists before removing pad" This reverts commit 6d8740476ccd3a3498dc4f18c19733643825c7b8. Depends on a core commit that was reverted --- gst/mpegpsmux/mpegpsmux.c | 4 +--- gst/qtmux/gstqtmux.c | 5 +---- gst/videomeasure/gstvideomeasure_ssim.c | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/gst/mpegpsmux/mpegpsmux.c b/gst/mpegpsmux/mpegpsmux.c index 249dfc9..d64fb35 100644 --- a/gst/mpegpsmux/mpegpsmux.c +++ b/gst/mpegpsmux/mpegpsmux.c @@ -588,9 +588,7 @@ mpegpsmux_release_pad (GstElement * element, GstPad * pad) } GST_OBJECT_UNLOCK (pad); - if (mux->collect) { - gst_collect_pads_remove_pad (mux->collect, pad); - } + gst_collect_pads_remove_pad (mux->collect, pad); } static gboolean diff --git a/gst/qtmux/gstqtmux.c b/gst/qtmux/gstqtmux.c index 728e1f3..1477db7 100644 --- a/gst/qtmux/gstqtmux.c +++ b/gst/qtmux/gstqtmux.c @@ -503,7 +503,6 @@ gst_qt_mux_finalize (GObject * object) atoms_context_free (qtmux->context); gst_object_unref (qtmux->collect); - qtmux->collect = NULL; g_slist_free (qtmux->sinkpads); @@ -3166,9 +3165,7 @@ gst_qt_mux_release_pad (GstElement * element, GstPad * pad) } } - if (mux->collect) { - gst_collect_pads_remove_pad (mux->collect, pad); - } + gst_collect_pads_remove_pad (mux->collect, pad); } static GstPad * diff --git a/gst/videomeasure/gstvideomeasure_ssim.c b/gst/videomeasure/gstvideomeasure_ssim.c index 5043e93..a99fa9f 100644 --- a/gst/videomeasure/gstvideomeasure_ssim.c +++ b/gst/videomeasure/gstvideomeasure_ssim.c @@ -1253,9 +1253,7 @@ gst_ssim_release_pad (GstElement * element, GstPad * pad) GST_DEBUG_OBJECT (ssim, "release pad %s:%s", GST_DEBUG_PAD_NAME (pad)); - if (ssim->collect) { - gst_collect_pads_remove_pad (ssim->collect, pad); - } + gst_collect_pads_remove_pad (ssim->collect, pad); gst_element_remove_pad (element, pad); } -- 2.7.4