From 4291ee94c4828c061ab1c1677085982908fb32b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 7 May 2018 09:17:16 +0200 Subject: [PATCH] videoaggregator: First override set/get_property vfuncs, then install properties Gives assertions otherwise. --- gst-libs/gst/video/gstvideoaggregator.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index ce56543..240602f 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -591,6 +591,10 @@ gst_video_aggregator_convert_pad_class_init (GstVideoAggregatorConvertPadClass * (GstVideoAggregatorPadClass *) klass; gobject_class->finalize = gst_video_aggregator_convert_pad_finalize; + gobject_class->get_property = + GST_DEBUG_FUNCPTR (gst_video_aggregator_convert_pad_get_property); + gobject_class->set_property = + GST_DEBUG_FUNCPTR (gst_video_aggregator_convert_pad_set_property); g_type_class_add_private (klass, sizeof (GstVideoAggregatorConvertPadPrivate)); @@ -602,11 +606,6 @@ gst_video_aggregator_convert_pad_class_init (GstVideoAggregatorConvertPadClass * "when scaling and converting this pad's video frames", GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_video_aggregator_convert_pad_get_property); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_video_aggregator_convert_pad_set_property); - vaggpadclass->update_conversion_info = GST_DEBUG_FUNCPTR (gst_video_aggregator_convert_pad_update_conversion_info_internal); -- 2.7.4