diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index 067286c459..4be9c24137 100644
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -24,15 +24,17 @@
 static gboolean _gst_media_info_debug = TRUE;
 
 #ifdef G_HAVE_ISO_VARARGS
-
 #define GMI_DEBUG(...) \
-  { if (_gst_media_info_debug) { g_print ( __VA_ARGS__ ); }}
-
+  G_STMT_START { \
+    if (_gst_media_info_debug) { g_print ( __VA_ARGS__ ); } \
+  } G_STMT_END
 #elif defined(G_HAVE_GNUC_VARARGS)
-
 #define GMI_DEBUG(format, args...) \
-  { if (_gst_media_info_debug) { g_print ( format , ## args ); }}
-
+  G_STMT_START { \
+    if (_gst_media_info_debug) { g_print ( format , ## args ); } \
+  } G_STMT_END
+#else
+#error Variable argument macros not supported by compiler
 #endif