From 754d0fca2582fe5e07023af8a6d6ba5285a19b11 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 9 Oct 2012 13:07:38 +0200
Subject: [PATCH] ivorbisdec: Rename debug category to prevent symbol conflict
 when using static linking

---
 ext/vorbis/gstivorbisdec.c | 4 ++--
 ext/vorbis/gstvorbisdec.c  | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/vorbis/gstivorbisdec.c b/ext/vorbis/gstivorbisdec.c
index bcb864d..095a06e 100644
--- a/ext/vorbis/gstivorbisdec.c
+++ b/ext/vorbis/gstivorbisdec.c
@@ -23,7 +23,7 @@
 
 #include "gstvorbisdec.h"
 
-GST_DEBUG_CATEGORY (vorbisdec_debug);
+GST_DEBUG_CATEGORY (ivorbisdec_debug);
 
 static gboolean
 plugin_init (GstPlugin * plugin)
@@ -34,7 +34,7 @@ plugin_init (GstPlugin * plugin)
           gst_vorbis_dec_get_type ()))
     return FALSE;
 
-  GST_DEBUG_CATEGORY_INIT (vorbisdec_debug, "ivorbisdec", 0,
+  GST_DEBUG_CATEGORY_INIT (ivorbisdec_debug, "ivorbisdec", 0,
       "vorbis decoding element (integer decoder)");
 
   return TRUE;
diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c
index 7cdf623..ac0632f 100644
--- a/ext/vorbis/gstvorbisdec.c
+++ b/ext/vorbis/gstvorbisdec.c
@@ -47,8 +47,13 @@
 
 #include "gstvorbiscommon.h"
 
+#ifndef TREMOR
 GST_DEBUG_CATEGORY_EXTERN (vorbisdec_debug);
 #define GST_CAT_DEFAULT vorbisdec_debug
+#else
+GST_DEBUG_CATEGORY_EXTERN (ivorbisdec_debug);
+#define GST_CAT_DEFAULT ivorbisdec_debug
+#endif
 
 static GstStaticPadTemplate vorbis_dec_src_factory =
 GST_STATIC_PAD_TEMPLATE ("src",
-- 
2.7.4