diff --git a/common b/common index c6bd62c43f..1a826743b0 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c6bd62c43f01b2012d81dfa61dd58777c41de07a +Subproject commit 1a826743b023d38a14e16cf1b3fb85eabdbb65d6 diff --git a/gst/gstelement.c b/gst/gstelement.c index df4984b82d..18bd15210b 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -1147,7 +1147,7 @@ gst_element_get_compatible_pad_template (GstElement *element, GstPadTemplate *co GstPadTemplate *newtempl = NULL; GList *padlist; - GST_DEBUG(GST_CAT_ELEMENT_PADS,"gst_element_get_pad_template_by_compatible()"); + GST_DEBUG(GST_CAT_ELEMENT_PADS,"gst_element_get_compatible_pad_template()"); g_return_val_if_fail (element != NULL, NULL); g_return_val_if_fail (GST_IS_ELEMENT (element), NULL); diff --git a/gst/gstpad.c b/gst/gstpad.c index f6f56b9857..f6730d8011 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -312,6 +312,7 @@ gst_pad_new (const gchar *name, { return gst_pad_custom_new (gst_real_pad_get_type (), name, direction); } + /** * gst_pad_custom_new_from_template: * @type: the custom GType for this pad diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c index fa46921622..809f0e8763 100644 --- a/gst/registries/gstxmlregistry.c +++ b/gst/registries/gstxmlregistry.c @@ -467,16 +467,20 @@ gst_xml_registry_open_func (GstXMLRegistry *registry, GstXMLRegistryMode mode) g_return_val_if_fail (gst_registry->flags & GST_REGISTRY_READABLE, FALSE); if (!plugin_times_older_than (paths, get_time (registry->location))) { - GST_INFO (GST_CAT_GST_INIT, "Registry out of date, rebuilding..."); - - gst_registry_rebuild (gst_registry); - if (gst_registry->flags & GST_REGISTRY_WRITABLE) { + GST_INFO (GST_CAT_GST_INIT, "Registry out of date, rebuilding..."); + + gst_registry_rebuild (gst_registry); + gst_registry_save (gst_registry); + if (!plugin_times_older_than (paths, get_time (registry->location))) { GST_INFO (GST_CAT_GST_INIT, "Registry still out of date, something is wrong..."); return FALSE; } + } else { + GST_INFO (GST_CAT_PLUGIN_LOADING, "Can't write to this registry and it's out of date, ignoring it"); + return FALSE; } }