mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-09-24 13:00:12 +00:00
Code Issues Projects Releases Wiki Activity

fallbackswitch: Fix remaining GType name conflicts between bundled and gstbase aggregator

Browse source 
Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/issues/67
This commit is contained in:
Sebastian Dröge 2019-08-27 11:30:35 +03:00
parent 183f197d32
commit 6aa09149b9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-plugin-fallbackswitch/src/base/gstaggregator.c
View file

@ -114,7 +114,7 @@ gst_aggregator_start_time_selection_get_type (void)
{0, NULL, NULL} {0, NULL, NULL}
}; };
gtype = g_enum_register_static ("GstAggregatorStartTimeSelection", values); gtype = g_enum_register_static ("GstAggregatorFallbackStartTimeSelection", values);
} }
return gtype; return gtype;
} }
@ -2708,7 +2708,7 @@ gst_aggregator_get_type (void)
}; };
_type = g_type_register_static (GST_TYPE_ELEMENT, _type = g_type_register_static (GST_TYPE_ELEMENT,
"GstAggregator", &info, G_TYPE_FLAG_ABSTRACT); "GstAggregatorFallback", &info, G_TYPE_FLAG_ABSTRACT);
aggregator_private_offset = aggregator_private_offset =
g_type_add_instance_private (_type, sizeof (GstAggregatorPrivate)); g_type_add_instance_private (_type, sizeof (GstAggregatorPrivate));