From 5ae625a333fb3e6bca7bc04d9f33d8495aadecd0 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 23 Jun 2014 22:36:23 +1000 Subject: [PATCH] videoaggregator: fix up the parent chaining for dispose and finalize --- gst-libs/gst/video/gstvideoaggregator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index b0ea776544..583e540b20 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -142,7 +142,7 @@ gst_videoaggregator_pad_finalize (GObject * o) videoconvert_convert_free (vaggpad->priv->convert); vaggpad->priv->convert = NULL; - G_OBJECT_CLASS (gst_videoaggregator_pad_parent_class)->dispose (o); + G_OBJECT_CLASS (gst_videoaggregator_pad_parent_class)->finalize (o); } static void @@ -1854,6 +1854,8 @@ gst_videoaggregator_dispose (GObject * o) GstVideoAggregator *vagg = GST_VIDEO_AGGREGATOR (o); gst_caps_replace (&vagg->priv->current_caps, NULL); + + G_OBJECT_CLASS (gst_videoaggregator_parent_class)->dispose (o); } static void