Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / gst / gstformat.c

diff --git a/gst/gstformat.c b/gst/gstformat.c
index e3bbba9..24c3d0f 100644 (file)
--- a/gst/gstformat.c
+++ b/gst/gstformat.c
@@ -53,7 +53,7 @@ static GstFormatDefinition standard_definitions[] = {
 };
 
 void
-_gst_format_initialize (void)
+_priv_gst_format_initialize (void)
 {
   GstFormatDefinition *standards = standard_definitions;
 
@@ -257,8 +257,7 @@ gst_format_iterate_definitions (void)
   g_static_mutex_lock (&mutex);
   /* FIXME: register a boxed type for GstFormatDefinition */
   result = gst_iterator_new_list (G_TYPE_POINTER,
-      g_static_mutex_get_mutex (&mutex), &_n_values, &_gst_formats,
-      NULL, NULL, NULL);
+      g_static_mutex_get_mutex (&mutex), &_n_values, &_gst_formats, NULL, NULL);
   g_static_mutex_unlock (&mutex);
 
   return result;