From d88af539f90f6fd662b25942b6e88e6aba130421 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 15 Sep 2009 18:57:25 +0200 Subject: [PATCH] mpegtspacketizer: Initialize debugging in _get_type There's no need for an extra function since all debuggin will require a MpegTSPacketizer which means that the GType will be created, therefore move the debug category initialization there. --- gst/mpegdemux/mpegtspacketizer.c | 8 +++++--- gst/mpegdemux/mpegtspacketizer.h | 1 - gst/mpegdemux/mpegtsparse.c | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gst/mpegdemux/mpegtspacketizer.c b/gst/mpegdemux/mpegtspacketizer.c index aea41ba86e..2cbb97551d 100644 --- a/gst/mpegdemux/mpegtspacketizer.c +++ b/gst/mpegdemux/mpegtspacketizer.c @@ -30,7 +30,9 @@ GST_DEBUG_CATEGORY_STATIC (mpegts_packetizer_debug); #define GST_CAT_DEFAULT mpegts_packetizer_debug -G_DEFINE_TYPE (MpegTSPacketizer, mpegts_packetizer, G_TYPE_OBJECT); +static void _init_local (void); +G_DEFINE_TYPE_EXTENDED (MpegTSPacketizer, mpegts_packetizer, G_TYPE_OBJECT, 0, + _init_local ()); static void mpegts_packetizer_dispose (GObject * object); static void mpegts_packetizer_finalize (GObject * object); @@ -2085,8 +2087,8 @@ out: return res; } -void -mpegts_packetizer_init_debug () +static void +_init_local () { GST_DEBUG_CATEGORY_INIT (mpegts_packetizer_debug, "mpegtspacketizer", 0, "MPEG transport stream parser"); diff --git a/gst/mpegdemux/mpegtspacketizer.h b/gst/mpegdemux/mpegtspacketizer.h index 97e15cf236..7886855e9f 100644 --- a/gst/mpegdemux/mpegtspacketizer.h +++ b/gst/mpegdemux/mpegtspacketizer.h @@ -107,7 +107,6 @@ typedef struct GType gst_mpegts_packetizer_get_type(void); -void mpegts_packetizer_init_debug (); MpegTSPacketizer *mpegts_packetizer_new (); void mpegts_packetizer_clear (MpegTSPacketizer *packetizer); void mpegts_packetizer_push (MpegTSPacketizer *packetizer, GstBuffer *buffer); diff --git a/gst/mpegdemux/mpegtsparse.c b/gst/mpegdemux/mpegtsparse.c index e3f905a824..698072137e 100644 --- a/gst/mpegdemux/mpegtsparse.c +++ b/gst/mpegdemux/mpegtsparse.c @@ -1302,7 +1302,6 @@ gst_mpegtsparse_plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (mpegts_parse_debug, "mpegtsparse", 0, "MPEG transport stream parser"); - mpegts_packetizer_init_debug (); gst_mpegtsdesc_init_debug (); return gst_element_register (plugin, "mpegtsparse",