mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-04 05:22:30 +00:00
playsinkconvertbin: avoid removing children from bin twice
GstBin base class removes children in dispose, so we need to do the same.
This commit is contained in:
parent
9d2a2750c2
commit
da69993a49
1 changed files with 10 additions and 1 deletions
|
@ -413,12 +413,20 @@ gst_play_sink_convert_bin_remove_elements (GstPlaySinkConvertBin * self)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_play_sink_convert_bin_finalize (GObject * object)
|
gst_play_sink_convert_bin_dispose (GObject * object)
|
||||||
{
|
{
|
||||||
GstPlaySinkConvertBin *self = GST_PLAY_SINK_CONVERT_BIN_CAST (object);
|
GstPlaySinkConvertBin *self = GST_PLAY_SINK_CONVERT_BIN_CAST (object);
|
||||||
|
|
||||||
gst_play_sink_convert_bin_remove_elements (self);
|
gst_play_sink_convert_bin_remove_elements (self);
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (parent_class)->dispose (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
gst_play_sink_convert_bin_finalize (GObject * object)
|
||||||
|
{
|
||||||
|
GstPlaySinkConvertBin *self = GST_PLAY_SINK_CONVERT_BIN_CAST (object);
|
||||||
|
|
||||||
gst_object_unref (self->sink_proxypad);
|
gst_object_unref (self->sink_proxypad);
|
||||||
g_mutex_free (self->lock);
|
g_mutex_free (self->lock);
|
||||||
|
|
||||||
|
@ -521,6 +529,7 @@ gst_play_sink_convert_bin_class_init (GstPlaySinkConvertBinClass * klass)
|
||||||
gobject_class = (GObjectClass *) klass;
|
gobject_class = (GObjectClass *) klass;
|
||||||
gstelement_class = (GstElementClass *) klass;
|
gstelement_class = (GstElementClass *) klass;
|
||||||
|
|
||||||
|
gobject_class->dispose = gst_play_sink_convert_bin_dispose;
|
||||||
gobject_class->finalize = gst_play_sink_convert_bin_finalize;
|
gobject_class->finalize = gst_play_sink_convert_bin_finalize;
|
||||||
|
|
||||||
gst_element_class_add_pad_template (gstelement_class,
|
gst_element_class_add_pad_template (gstelement_class,
|
||||||
|
|
Loading…
Reference in a new issue