Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / gststructure.h

diff --git a/gst/gststructure.h b/gst/gststructure.h
index e0e453b..e96799e 100644 (file)
--- a/gst/gststructure.h
+++ b/gst/gststructure.h
@@ -99,7 +99,7 @@ gboolean              gst_structure_set_parent_refcount  (GstStructure            *structure
                                                             gint                    *refcount);
 void                    gst_structure_free                 (GstStructure            *structure);
 
-G_CONST_RETURN gchar *  gst_structure_get_name             (const GstStructure      *structure);
+const gchar *          gst_structure_get_name             (const GstStructure      *structure);
 GQuark                 gst_structure_get_name_id          (const GstStructure      *structure);
 gboolean                gst_structure_has_name             (const GstStructure      *structure,
                                                            const gchar             *name);
@@ -150,9 +150,9 @@ gboolean                gst_structure_id_get               (const GstStructure
                                                             GQuark                   first_field_id,
                                                             ...) G_GNUC_NULL_TERMINATED;
 
-G_CONST_RETURN GValue * gst_structure_id_get_value         (const GstStructure      *structure,
+const GValue *         gst_structure_id_get_value         (const GstStructure      *structure,
                                                            GQuark                   field);
-G_CONST_RETURN GValue * gst_structure_get_value            (const GstStructure      *structure,
+const GValue *         gst_structure_get_value            (const GstStructure      *structure,
                                                            const gchar             *fieldname);
 void                    gst_structure_remove_field         (GstStructure            *structure,
                                                            const gchar             *fieldname);
@@ -210,7 +210,7 @@ gboolean                gst_structure_get_date_time        (const GstStructure
 gboolean                gst_structure_get_clock_time       (const GstStructure      *structure,
                                                            const gchar             *fieldname,
                                                            GstClockTime            *value);
-G_CONST_RETURN gchar *  gst_structure_get_string           (const GstStructure      *structure,
+const gchar *          gst_structure_get_string           (const GstStructure      *structure,
                                                            const gchar             *fieldname);
 gboolean                gst_structure_get_enum             (const GstStructure      *structure,
                                                            const gchar             *fieldname,