summaryrefslogtreecommitdiffstats
path: root/gst/videomixer
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2009-06-30 12:39:19 +0200
committerEdward Hervey <bilboed@bilboed.com>2009-07-10 14:37:07 +0200
commitace4cb229542ae2c4ca8331d840e6bb3acd03c22 (patch)
tree24c0df8db39f2b234c82f2bc38e44a9d34beeee7 /gst/videomixer
parent3ebf5e9a2ab3ede71556d63f9d678b082e408af5 (diff)
videomixer: Make debugging category global to all the code.
Diffstat (limited to 'gst/videomixer')
-rw-r--r--gst/videomixer/blend_i420.c1
-rw-r--r--gst/videomixer/videomixer.c3
-rw-r--r--gst/videomixer/videomixer.h4
-rw-r--r--gst/videomixer/videomixerpad.h1
4 files changed, 7 insertions, 2 deletions
diff --git a/gst/videomixer/blend_i420.c b/gst/videomixer/blend_i420.c
index 91fa792f..8d7399bc 100644
--- a/gst/videomixer/blend_i420.c
+++ b/gst/videomixer/blend_i420.c
@@ -22,6 +22,7 @@
#include <gst/gst.h>
#include <string.h>
+#include "videomixer.h"
#define BLEND_NORMAL(Y1,U1,V1,Y2,U2,V2,alpha,Y,U,V) \
Y = ((Y1*(255-alpha))+(Y2*alpha))>>8; \
diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index f4441dce..e782a671 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -71,8 +71,7 @@
#include "videomixer.h"
-GST_DEBUG_CATEGORY_STATIC (gst_videomixer_debug);
-#define GST_CAT_DEFAULT gst_videomixer_debug
+GST_DEBUG_CATEGORY (gst_videomixer_debug);
#define GST_VIDEO_MIXER_GET_STATE_LOCK(mix) \
(GST_VIDEO_MIXER(mix)->state_lock)
diff --git a/gst/videomixer/videomixer.h b/gst/videomixer/videomixer.h
index 707bf27b..7266a9af 100644
--- a/gst/videomixer/videomixer.h
+++ b/gst/videomixer/videomixer.h
@@ -23,6 +23,10 @@
#include <gst/gst.h>
#include "videomixerpad.h"
+GST_DEBUG_CATEGORY_EXTERN (gst_videomixer_debug);
+#define GST_CAT_DEFAULT gst_videomixer_debug
+
+
G_BEGIN_DECLS
#define GST_TYPE_VIDEO_MIXER (gst_videomixer_get_type())
diff --git a/gst/videomixer/videomixerpad.h b/gst/videomixer/videomixerpad.h
index 862bd46f..776da5de 100644
--- a/gst/videomixer/videomixerpad.h
+++ b/gst/videomixer/videomixerpad.h
@@ -21,6 +21,7 @@
#define __GST_VIDEO_MIXER_PAD_H__
#include <gst/gst.h>
+#include <gst/base/gstcollectpads.h>
G_BEGIN_DECLS