diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-09 13:07:38 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-09 13:10:38 +0200 |
| commit | 754d0fca2582fe5e07023af8a6d6ba5285a19b11 (patch) | |
| tree | e1a27ca716102d468e463ce56754dfb5db35e1ab | |
| parent | 3591df23b1ae2deefc9e9a2dbb524ee11cfefdb6 (diff) | |
ivorbisdec: Rename debug category to prevent symbol conflict when using static linking
| -rw-r--r-- | ext/vorbis/gstivorbisdec.c | 4 | ||||
| -rw-r--r-- | 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 bcb864d74..095a06ef1 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 7cdf62349..ac0632f7e 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", |