summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2018-05-07 09:17:16 +0200
committerSebastian Dröge <sebastian@centricular.com>2018-05-07 09:17:16 +0200
commite21481e301cd5dff85656aeb2010294012b02934 (patch)
treeac68ea89650f3a44e5e0941fd5ae5e701185b3ca /gst-libs
parent7d4b03752772de5c7527dda8fea97b8a05c21517 (diff)
videoaggregator: First override set/get_property vfuncs, then install properties
Gives assertions otherwise.
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/video/gstvideoaggregator.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
index ce5654395..240602fb6 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);