From ace4cb229542ae2c4ca8331d840e6bb3acd03c22 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 30 Jun 2009 12:39:19 +0200
Subject: videomixer: Make debugging category global to all the code.

---
 gst/videomixer/blend_i420.c    | 1 +
 gst/videomixer/videomixer.c    | 3 +--
 gst/videomixer/videomixer.h    | 4 ++++
 gst/videomixer/videomixerpad.h | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'gst/videomixer')

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
 
-- 
cgit