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 5313f90..24c3d0f 100644 (file)
--- a/gst/gstformat.c
+++ b/gst/gstformat.c
@@ -49,11 +49,11 @@ static GstFormatDefinition standard_definitions[] = {
   {GST_FORMAT_TIME, "time", "Time", 0},
   {GST_FORMAT_BUFFERS, "buffers", "Buffers", 0},
   {GST_FORMAT_PERCENT, "percent", "Percent", 0},
-  {0, NULL, NULL, 0}
+  {GST_FORMAT_UNDEFINED, NULL, NULL, 0}
 };
 
 void
-_gst_format_initialize (void)
+_priv_gst_format_initialize (void)
 {
   GstFormatDefinition *standards = standard_definitions;
 
@@ -144,16 +144,16 @@ gst_format_register (const gchar * nick, const gchar * description)
   GstFormatDefinition *format;
   GstFormat query;
 
-  g_return_val_if_fail (nick != NULL, 0);
-  g_return_val_if_fail (description != NULL, 0);
+  g_return_val_if_fail (nick != NULL, GST_FORMAT_UNDEFINED);
+  g_return_val_if_fail (description != NULL, GST_FORMAT_UNDEFINED);
 
   query = gst_format_get_by_nick (nick);
   if (query != GST_FORMAT_UNDEFINED)
     return query;
 
   g_static_mutex_lock (&mutex);
-  format = g_new0 (GstFormatDefinition, 1);
-  format->value = _n_values;
+  format = g_slice_new (GstFormatDefinition);
+  format->value = (GstFormat) _n_values;
   format->nick = g_strdup (nick);
   format->description = g_strdup (description);
   format->quark = g_quark_from_static_string (format->nick);
@@ -182,7 +182,7 @@ gst_format_get_by_nick (const gchar * nick)
 {
   GstFormatDefinition *format;
 
-  g_return_val_if_fail (nick != NULL, 0);
+  g_return_val_if_fail (nick != NULL, GST_FORMAT_UNDEFINED);
 
   g_static_mutex_lock (&mutex);
   format = g_hash_table_lookup (_nick_to_format, nick);
@@ -247,7 +247,7 @@ gst_format_get_details (GstFormat format)
  * Iterate all the registered formats. The format definition is read
  * only.
  *
- * Returns: A GstIterator of #GstFormatDefinition.
+ * Returns: (transfer full): a GstIterator of #GstFormatDefinition.
  */
 GstIterator *
 gst_format_iterate_definitions (void)
@@ -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;