Revert "Check that collectpads exists before removing pad"
This reverts commit 6d8740476ccd3a3498dc4f18c19733643825c7b8. Depends on a core commit that was reverted
This commit is contained in:
parent
6d8740476c
commit
715529c963
@ -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
|
||||
|
@ -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 *
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user