summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--ext/annodex/gstcmmlparser.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c2df11df..0e71c165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-31 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+
+ Patch by: Craig Keogh <cskeogh at adam dot com dot au>
+
+ * ext/annodex/gstcmmlparser.c: (gst_cmml_parser_parse_chunk):
+ Fix compiler warnings caused by passing a string as format string
+ instead of "%s" and then the string. This is only exposed by -Wformat=2
+ as used by default on Ubuntu. Fixes bug #550015.
+
2008-08-30 Tim-Philipp Müller <tim.muller at collabora co uk>
* ext/raw1394/gsthdv1394src.c: (gst_hdv1394src_create):
diff --git a/ext/annodex/gstcmmlparser.c b/ext/annodex/gstcmmlparser.c
index abc79e76..221f9f91 100644
--- a/ext/annodex/gstcmmlparser.c
+++ b/ext/annodex/gstcmmlparser.c
@@ -112,7 +112,7 @@ gst_cmml_parser_parse_chunk (GstCmmlParser * parser,
GST_DEBUG ("Error occurred decoding chunk %s", data);
g_set_error (err,
- GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED, xml_error->message);
+ GST_LIBRARY_ERROR, GST_LIBRARY_ERROR_FAILED, "%s", xml_error->message);
return FALSE;
}