From d240c98225f7839d58c37efbb873e2a6bdebaaa4 Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Sat, 21 Feb 2015 17:35:03 +0000 Subject: [PATCH] mxf-example: merge returns in g_value_to_string() --- tests/examples/mxf/mxfdemux-structure.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/examples/mxf/mxfdemux-structure.c b/tests/examples/mxf/mxfdemux-structure.c index 32df7578e5..7b5d37b1c9 100644 --- a/tests/examples/mxf/mxfdemux-structure.c +++ b/tests/examples/mxf/mxfdemux-structure.c @@ -29,31 +29,25 @@ static GtkTreeStore *treestore = NULL; static gchar * g_value_to_string (const GValue * val) { + gchar *ret = NULL; + if (G_VALUE_TYPE (val) == GST_TYPE_BUFFER) { GstBuffer *buf = gst_value_get_buffer (val); GstMapInfo map; - gchar *ret; gst_buffer_map (buf, &map, GST_MAP_READ); ret = g_base64_encode (map.data, map.size); gst_buffer_unmap (buf, &map); - - return ret; } else { GValue s = { 0, }; - gchar *ret; g_value_init (&s, G_TYPE_STRING); - - if (!g_value_transform (val, &s)) { - return NULL; + if (g_value_transform (val, &s)) { + ret = g_value_dup_string (&s); + g_value_unset (&s); } - - ret = g_value_dup_string (&s); - g_value_unset (&s); - - return ret; } + return ret; } static gboolean