summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gst/smpte/gstsmpte.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 232d7983..0b368345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2007-02-06 Tim-Philipp Müller <tim at centricular dot net>
* gst/smpte/gstsmpte.c: (gst_smpte_transition_type_get_type):
+ Let's try this again and use the right cast this time.
+
+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.
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index eb5a50ad..44420ac8 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -146,8 +146,9 @@ gst_smpte_transition_type_get_type (void)
definitions = g_list_next (definitions);
smpte_transitions[i].value = definition->type;
- smpte_transitions[i].value_nick = (const gchar *) definition->short_name;
- smpte_transitions[i].value_name = (const gchar *) definition->long_name;
+ /* older GLib versions have the two fields as non-const, hence the cast */
+ smpte_transitions[i].value_nick = (gchar *) definition->short_name;
+ smpte_transitions[i].value_name = (gchar *) definition->long_name;
i++;
}