Use GST_DEBUG_CATEGORY_STATIC where possible (#342503) plus two minor macro fixes.

Original commit message from CVS:
* ext/annodex/gstcmmldec.c:
* ext/annodex/gstcmmlenc.c:
* ext/annodex/gstcmmlparser.c:
* ext/dv/gstdvdec.c:
* ext/dv/gstdvdemux.c:
* ext/gdk_pixbuf/pixbufscale.c:
* ext/jpeg/gstjpegenc.c:
* ext/jpeg/gstsmokedec.c:
* ext/jpeg/gstsmokeenc.c:
* ext/libpng/gstpngdec.c:
* ext/libpng/gstpngenc.c:
* ext/speex/gstspeexenc.c:
* gst/alpha/gstalphacolor.c:
* gst/cutter/gstcutter.c:
* gst/debug/gstnavigationtest.c:
* gst/icydemux/gsticydemux.c:
* gst/level/gstlevel.c:
* gst/multipart/multipart.c:
* gst/rtp/gstrtpamrpay.c:
* gst/rtp/gstrtpdepay.c:
* gst/rtp/gstrtpilbcpay.c:
* gst/rtp/gstrtpmp4gpay.c:
* gst/rtp/gstrtpmp4vpay.c:
* gst/rtsp/gstrtpdec.c:
* gst/rtsp/gstrtspsrc.c:
* gst/udp/gstdynudpsink.c:
* gst/udp/gstmultiudpsink.c:
* gst/udp/gstudpsrc.c:
* gst/videobox/gstvideobox.c:
* gst/videofilter/gstvideoflip.c:
Use GST_DEBUG_CATEGORY_STATIC where possible (#342503)
plus two minor macro fixes.

18 files changed, 20 insertions, 22 deletions

diff --git a/gst/alpha/gstalphacolor.c b/gst/alpha/gstalphacolor.c
index 3cf6c7cf..15c26c12 100644
--- a/gst/alpha/gstalphacolor.c
+++ b/gst/alpha/gstalphacolor.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-GST_DEBUG_CATEGORY (alpha_color_debug);
+GST_DEBUG_CATEGORY_STATIC (alpha_color_debug);
 #define GST_CAT_DEFAULT alpha_color_debug
 
 #define GST_TYPE_ALPHA_COLOR \
@@ -37,7 +37,7 @@ GST_DEBUG_CATEGORY (alpha_color_debug);
   (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALPHA_COLOR,GstAlphaColorClass))
 #define GST_IS_ALPHA_COLOR(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALPHA_COLOR))
-#define GST_IS_ALPHA_COLOR_CLASS(obj) \
+#define GST_IS_ALPHA_COLOR_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALPHA_COLOR))
 
 typedef struct _GstAlphaColor GstAlphaColor;
diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index b45af6ee..fc75754f 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -27,7 +27,7 @@
 #include "gstcutter.h"
 #include "math.h"
 
-GST_DEBUG_CATEGORY (cutter_debug);
+GST_DEBUG_CATEGORY_STATIC (cutter_debug);
 #define GST_CAT_DEFAULT cutter_debug
 
 #define CUTTER_DEFAULT_THRESHOLD_LEVEL    0.1
diff --git a/gst/debug/gstnavigationtest.c b/gst/debug/gstnavigationtest.c
index b9c84b06..0b3e549c 100644
--- a/gst/debug/gstnavigationtest.c
+++ b/gst/debug/gstnavigationtest.c
@@ -28,7 +28,7 @@
 
 #include <gst/video/video.h>
 
-GST_DEBUG_CATEGORY (navigationtest_debug);
+GST_DEBUG_CATEGORY_STATIC (navigationtest_debug);
 #define GST_CAT_DEFAULT navigationtest_debug
 
 static const GstElementDetails navigationtest_details =
diff --git a/gst/icydemux/gsticydemux.c b/gst/icydemux/gsticydemux.c
index 688e7df1..1518b261 100644
--- a/gst/icydemux/gsticydemux.c
+++ b/gst/icydemux/gsticydemux.c
@@ -56,7 +56,7 @@ GST_ELEMENT_DETAILS ("ICY tag demuxer",
 
 #define ICY_TYPE_FIND_MAX_SIZE (40*1024)
 
-GST_DEBUG_CATEGORY (icydemux_debug);
+GST_DEBUG_CATEGORY_STATIC (icydemux_debug);
 #define GST_CAT_DEFAULT (icydemux_debug)
 
 static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 9097e5de..b68b70cc 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -83,7 +83,7 @@
 #include "gstlevel.h"
 #include "math.h"
 
-GST_DEBUG_CATEGORY (level_debug);
+GST_DEBUG_CATEGORY_STATIC (level_debug);
 #define GST_CAT_DEFAULT level_debug
 
 static const GstElementDetails level_details = GST_ELEMENT_DETAILS ("Level",
diff --git a/gst/multipart/multipart.c b/gst/multipart/multipart.c
index 871f9872..c1598232 100644
--- a/gst/multipart/multipart.c
+++ b/gst/multipart/multipart.c
@@ -26,8 +26,6 @@
 extern gboolean gst_multipart_demux_plugin_init (GstPlugin * plugin);
 extern gboolean gst_multipart_mux_plugin_init (GstPlugin * plugin);
 
-GST_DEBUG_CATEGORY (vorbisdec_debug);
-
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
diff --git a/gst/rtp/gstrtpamrpay.c b/gst/rtp/gstrtpamrpay.c
index fd715ac2..b7e15e67 100644
--- a/gst/rtp/gstrtpamrpay.c
+++ b/gst/rtp/gstrtpamrpay.c
@@ -27,7 +27,7 @@
 
 #include "gstrtpamrpay.h"
 
-GST_DEBUG_CATEGORY (rtpamrpay_debug);
+GST_DEBUG_CATEGORY_STATIC (rtpamrpay_debug);
 #define GST_CAT_DEFAULT (rtpamrpay_debug)
 
 /* references:
diff --git a/gst/rtp/gstrtpdepay.c b/gst/rtp/gstrtpdepay.c
index d5623e8f..c309ae31 100644
--- a/gst/rtp/gstrtpdepay.c
+++ b/gst/rtp/gstrtpdepay.c
@@ -20,7 +20,7 @@
 
 #include "gstrtpdepay.h"
 
-GST_DEBUG_CATEGORY (rtpdepay_debug);
+GST_DEBUG_CATEGORY_STATIC (rtpdepay_debug);
 #define GST_CAT_DEFAULT (rtpdepay_debug)
 
 /* elementfactory information */
diff --git a/gst/rtp/gstrtpilbcpay.c b/gst/rtp/gstrtpilbcpay.c
index 3882556a..cb9409cd 100644
--- a/gst/rtp/gstrtpilbcpay.c
+++ b/gst/rtp/gstrtpilbcpay.c
@@ -32,7 +32,7 @@ static GstElementDetails gst_rtpilbcpay_details = {
   "Philippe Kalaf <philippe.kalaf@collabora.co.uk>"
 };
 
-GST_DEBUG_CATEGORY (rtpilbcpay_debug);
+GST_DEBUG_CATEGORY_STATIC (rtpilbcpay_debug);
 #define GST_CAT_DEFAULT (rtpilbcpay_debug)
 
 static GstStaticPadTemplate gst_rtpilbcpay_sink_template =
@@ -144,8 +144,8 @@ gst_rtpilbcpay_setcaps (GstBaseRTPPayload * basertppayload, GstCaps * caps)
       gst_basertppayload_set_outcaps (basertppayload, "mode", G_TYPE_INT, mode,
       NULL);
   if (mode != rtpilbcpay->mode && rtpilbcpay->mode != -1) {
-    GST_ERROR_OBJECT (rtpilbcpay, "Mode has changed from %d to %d! \
-          Mode cannot change while streaming", rtpilbcpay->mode, mode);
+    GST_ERROR_OBJECT (rtpilbcpay, "Mode has changed from %d to %d! "
+        "Mode cannot change while streaming", rtpilbcpay->mode, mode);
     return FALSE;
   }
   rtpilbcpay->mode = mode;
diff --git a/gst/rtp/gstrtpmp4gpay.c b/gst/rtp/gstrtpmp4gpay.c
index abe60892..e09195e8 100644
--- a/gst/rtp/gstrtpmp4gpay.c
+++ b/gst/rtp/gstrtpmp4gpay.c
@@ -27,7 +27,7 @@
 
 #include "gstrtpmp4gpay.h"
 
-GST_DEBUG_CATEGORY (rtpmp4gpay_debug);
+GST_DEBUG_CATEGORY_STATIC (rtpmp4gpay_debug);
 #define GST_CAT_DEFAULT (rtpmp4gpay_debug)
 
 /* elementfactory information */
diff --git a/gst/rtp/gstrtpmp4vpay.c b/gst/rtp/gstrtpmp4vpay.c
index 1d4c9c1e..fc091e71 100644
--- a/gst/rtp/gstrtpmp4vpay.c
+++ b/gst/rtp/gstrtpmp4vpay.c
@@ -27,7 +27,7 @@
 
 #include "gstrtpmp4vpay.h"
 
-GST_DEBUG_CATEGORY (rtpmp4vpay_debug);
+GST_DEBUG_CATEGORY_STATIC (rtpmp4vpay_debug);
 #define GST_CAT_DEFAULT (rtpmp4vpay_debug)
 
 /* elementfactory information */
diff --git a/gst/rtsp/gstrtpdec.c b/gst/rtsp/gstrtpdec.c
index 39917423..24054d83 100644
--- a/gst/rtsp/gstrtpdec.c
+++ b/gst/rtsp/gstrtpdec.c
@@ -33,7 +33,7 @@
 
 #include "gstrtpdec.h"
 
-GST_DEBUG_CATEGORY (rtpdec_debug);
+GST_DEBUG_CATEGORY_STATIC (rtpdec_debug);
 #define GST_CAT_DEFAULT (rtpdec_debug)
 
 /* elementfactory information */
diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index c909415f..347e1e51 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -70,7 +70,7 @@
 #include "gstrtspsrc.h"
 #include "sdp.h"
 
-GST_DEBUG_CATEGORY (rtspsrc_debug);
+GST_DEBUG_CATEGORY_STATIC (rtspsrc_debug);
 #define GST_CAT_DEFAULT (rtspsrc_debug)
 
 /* elementfactory information */
diff --git a/gst/udp/gstdynudpsink.c b/gst/udp/gstdynudpsink.c
index 661f55a2..20eab163 100644
--- a/gst/udp/gstdynudpsink.c
+++ b/gst/udp/gstdynudpsink.c
@@ -25,7 +25,7 @@
 #include "gstdynudpsink.h"
 #include <gst/netbuffer/gstnetbuffer.h>
 
-GST_DEBUG_CATEGORY (dynudpsink_debug);
+GST_DEBUG_CATEGORY_STATIC (dynudpsink_debug);
 #define GST_CAT_DEFAULT (dynudpsink_debug)
 
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c
index 0a626614..a770f1a6 100644
--- a/gst/udp/gstmultiudpsink.c
+++ b/gst/udp/gstmultiudpsink.c
@@ -36,7 +36,7 @@
 #include "gstudp-marshal.h"
 #include "gstmultiudpsink.h"
 
-GST_DEBUG_CATEGORY (multiudpsink_debug);
+GST_DEBUG_CATEGORY_STATIC (multiudpsink_debug);
 #define GST_CAT_DEFAULT (multiudpsink_debug)
 
 static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index 395f1785..d0f09c3b 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -86,7 +86,7 @@
 #include <sys/filio.h>
 #endif
 
-GST_DEBUG_CATEGORY (udpsrc_debug);
+GST_DEBUG_CATEGORY_STATIC (udpsrc_debug);
 #define GST_CAT_DEFAULT (udpsrc_debug)
 
 /* the select call is also performed on the control sockets, that way
diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index 602d4746..f3cb715f 100644
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -27,7 +27,7 @@
 #include <liboil/liboil.h>
 #include <string.h>
 
-GST_DEBUG_CATEGORY (videobox_debug);
+GST_DEBUG_CATEGORY_STATIC (videobox_debug);
 #define GST_CAT_DEFAULT videobox_debug
 
 #define GST_TYPE_VIDEO_BOX \
diff --git a/gst/videofilter/gstvideoflip.c b/gst/videofilter/gstvideoflip.c
index f9312e64..043f0275 100644
--- a/gst/videofilter/gstvideoflip.c
+++ b/gst/videofilter/gstvideoflip.c
@@ -60,7 +60,7 @@ enum
       /* FILL ME */
 };
 
-GST_DEBUG_CATEGORY (video_flip_debug);
+GST_DEBUG_CATEGORY_STATIC (video_flip_debug);
 #define GST_CAT_DEFAULT video_flip_debug
 
 static const GstElementDetails video_flip_details =