From d33d8cf026d203812d64180450adcb9fd314fdf2 Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Fri, 4 Jul 2014 03:21:30 +0200 Subject: [PATCH] avidemux, wavparse: Print invalid fourcc in hex Previously this was printed as characters which caused later processing of the error message to sometimes warn about non-UTF-8 characters. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=732714 --- gst/avi/gstavidemux.c | 3 +-- gst/wavparse/gstwavparse.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index c84ffce..23e1437 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -1072,8 +1072,7 @@ gst_avi_demux_parse_file_header (GstElement * element, GstBuffer * buf) not_avi: { GST_ELEMENT_ERROR (element, STREAM, WRONG_TYPE, (NULL), - ("File is not an AVI file: %" GST_FOURCC_FORMAT, - GST_FOURCC_ARGS (doctype))); + ("File is not an AVI file: 0x%" G_GINT32_MODIFIER "x", doctype)); return FALSE; } } diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 167e4ba..28d2063 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -303,8 +303,7 @@ gst_wavparse_parse_file_header (GstElement * element, GstBuffer * buf) not_wav: { GST_ELEMENT_ERROR (element, STREAM, WRONG_TYPE, (NULL), - ("File is not a WAVE file: %" GST_FOURCC_FORMAT, - GST_FOURCC_ARGS (doctype))); + ("File is not a WAVE file: 0x%" G_GINT32_MODIFIER "x", doctype)); return FALSE; } } -- 2.7.4