summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-02-06 16:24:57 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-02-06 16:24:57 +0000
commit7dd530e6c4a1c581fc16afa0e65b97bf619b7f75 (patch)
tree7fc6af07784cc2eb2ee9827da0238e5e002c1907
parent881308d5c58f0b4c8a5cd3b32f924c03af12ee0d (diff)
gst/smpte/gstsmpte.c: Add cast to avoid compiler warnings with older GLib versions where the nick/name members in GEn...
Original commit message from CVS: * gst/smpte/gstsmpte.c: (gst_smpte_transition_type_get_type): Add cast to avoid compiler warnings with older GLib versions where the nick/name members in GEnumValue are not declared as constant strings.
-rw-r--r--ChangeLog7
-rw-r--r--gst/smpte/gstsmpte.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bf5d9ad5..232d7983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-02-06 Tim-Philipp Müller <tim at centricular dot net>
+ * gst/smpte/gstsmpte.c: (gst_smpte_transition_type_get_type):
+ Add cast to avoid compiler warnings with older GLib versions
+ where the nick/name members in GEnumValue are not declared as
+ constant strings.
+
+2007-02-06 Tim-Philipp Müller <tim at centricular dot net>
+
* ext/gconf/gconf.c: (gst_gconf_get_key_for_sink_profile),
(gst_gconf_render_bin_from_key),
(gst_gconf_get_default_audio_sink):
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index 95fd31e2..eb5a50ad 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -146,8 +146,8 @@ gst_smpte_transition_type_get_type (void)
definitions = g_list_next (definitions);
smpte_transitions[i].value = definition->type;
- smpte_transitions[i].value_nick = definition->short_name;
- smpte_transitions[i].value_name = definition->long_name;
+ smpte_transitions[i].value_nick = (const gchar *) definition->short_name;
+ smpte_transitions[i].value_name = (const gchar *) definition->long_name;
i++;
}