summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
m---------common0
-rw-r--r--ext/gconf/gconf.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 02f821f2..be8b0642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-21 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * ext/gconf/gconf.h:
+ Make the prototype of gst_gconf_get_key_for_sink_profile
+ match the implementation.
+ Patch by: Damien Carbery <damien dot carbery at sun dot com>
+ Fixes: #449747
+
2007-06-20 Michael Smith <msmith@fluendo.com>
* gst/rtp/gstrtpdepay.c:
diff --git a/common b/common
-Subproject 6cb0000a5a30d4fc580a06489106a637fca024c
+Subproject 14c5a68981278f642e4ca5fd5ca08554fc78b34
diff --git a/ext/gconf/gconf.h b/ext/gconf/gconf.h
index 4204a29d..b1153e93 100644
--- a/ext/gconf/gconf.h
+++ b/ext/gconf/gconf.h
@@ -49,7 +49,7 @@ gchar * gst_gconf_get_string (const gchar *key);
void gst_gconf_set_string (const gchar *key,
const gchar *value);
-const gchar * gst_gconf_get_key_for_sink_profile (guint profile);
+const gchar * gst_gconf_get_key_for_sink_profile (GstGConfProfile profile);
GstElement * gst_gconf_render_bin_from_key (const gchar *key);
GstElement * gst_gconf_render_bin_with_default (const gchar *bin,