From a155deaabf2f4349778ca41e9aaa772da5a95d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 12 Apr 2010 14:50:46 +0100 Subject: [PATCH] matroskademux, qtdemux: minor code cleanup in avc_level_idc_to_string() Do the same with slightly fewer LOC. --- gst/matroska/matroska-demux.c | 19 +++++-------------- gst/qtdemux/qtdemux.c | 19 +++++-------------- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 9ca9e50193..59b2cb1a5b 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -5869,25 +5869,16 @@ avc_profile_idc_to_string (guint profile_idc, guint constraint_set_flags) static gchar * avc_level_idc_to_string (guint level_idc, guint constraint_set_flags) { - const gchar *level = NULL; - gchar buf[4]; gint csf3; csf3 = (constraint_set_flags & 0x10) >> 4; if (level_idc == 11 && csf3) - level = "1b"; - else { - /* Level is (level_idc / 10) */ - if (level_idc % 10 == 0) - g_sprintf (buf, "%u", level_idc / 10); - else - g_sprintf (buf, "%u.%u", level_idc / 10, level_idc % 10); - - level = buf; - } - - return g_strdup (level); + return g_strdup ("1b"); + else if (level_idc % 10 == 0) + return g_strdup_printf ("%u", level_idc / 10); + else + return g_strdup_printf ("%u.%u", level_idc / 10, level_idc % 10); } static void diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 558289c65f..8502a2ff01 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -5073,25 +5073,16 @@ avc_profile_idc_to_string (guint profile_idc, guint constraint_set_flags) static gchar * avc_level_idc_to_string (guint level_idc, guint constraint_set_flags) { - const gchar *level = NULL; - gchar buf[4]; gint csf3; csf3 = (constraint_set_flags & 0x10) >> 4; if (level_idc == 11 && csf3) - level = "1b"; - else { - /* Level is (level_idc / 10) */ - if (level_idc % 10 == 0) - g_sprintf (buf, "%u", level_idc / 10); - else - g_sprintf (buf, "%u.%u", level_idc / 10, level_idc % 10); - - level = buf; - } - - return g_strdup (level); + return g_strdup ("1b"); + else if (level_idc % 10 == 0) + return g_strdup_printf ("%u", level_idc / 10); + else + return g_strdup_printf ("%u.%u", level_idc / 10, level_idc % 10); } static void