diff options
| author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2008-02-14 14:22:57 +0000 |
|---|---|---|
| committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2008-02-14 14:22:57 +0000 |
| commit | 8ede0678be4921abd03bca7d68afb52844c7b8fa (patch) | |
| tree | 88ac53997106c4e826eb70642d656caaa668efbc | |
| parent | 3e6837ee1b6f5c20bd0d70eb106e0b573984db09 (diff) | |
| download | gstreamer-plugins-bad-8ede0678be4921abd03bca7d68afb52844c7b8fa.tar.gz | |
gst/mpegtsparse/: Make sure the gstmpegdesc debug lines do not critical when GST_DEBUG is enabled and also actually o...
Original commit message from CVS:
* gst/mpegtsparse/gstmpegdesc.c:
* gst/mpegtsparse/gstmpegdesc.h:
* gst/mpegtsparse/mpegtsparse.c:
Make sure the gstmpegdesc debug lines do not critical
when GST_DEBUG is enabled and also actually output.
Thanks to Alessandro Decina for spotting.
Fixes #516448
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gst/mpegtsparse/gstmpegdesc.c | 11 | ||||
| -rw-r--r-- | gst/mpegtsparse/gstmpegdesc.h | 1 | ||||
| -rw-r--r-- | gst/mpegtsparse/mpegtsparse.c | 2 |
4 files changed, 22 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2008-02-14 Zaheer Abbas Merali <zaheerabbas at merali dot org> + + * gst/mpegtsparse/gstmpegdesc.c: + * gst/mpegtsparse/gstmpegdesc.h: + * gst/mpegtsparse/mpegtsparse.c: + Make sure the gstmpegdesc debug lines do not critical + when GST_DEBUG is enabled and also actually output. + Thanks to Alessandro Decina for spotting. + Fixes #516448 + 2008-02-13 Jan Schmidt <jan.schmidt@sun.com> * gst-libs/gst/Makefile.am: diff --git a/gst/mpegtsparse/gstmpegdesc.c b/gst/mpegtsparse/gstmpegdesc.c index 9a4e11958..727b3e8af 100644 --- a/gst/mpegtsparse/gstmpegdesc.c +++ b/gst/mpegtsparse/gstmpegdesc.c @@ -35,8 +35,8 @@ #include "gstmpegdesc.h" -GST_DEBUG_CATEGORY (gstflumpegdesc_debug); -#define GST_CAT_DEFAULT (gstflumpegdesc_debug) +GST_DEBUG_CATEGORY (gstmpegtsdesc_debug); +#define GST_CAT_DEFAULT (gstmpegtsdesc_debug) void gst_mpeg_descriptor_free (GstMPEGDescriptor * desc) @@ -196,3 +196,10 @@ gst_mpeg_descriptor_nth (GstMPEGDescriptor * desc, guint i) } return NULL; } + +void +gst_mpegtsdesc_init_debug () +{ + GST_DEBUG_CATEGORY_INIT (gstmpegtsdesc_debug, "mpegtsdesc", 0, + "MPEG transport stream parser (descriptor)"); +} diff --git a/gst/mpegtsparse/gstmpegdesc.h b/gst/mpegtsparse/gstmpegdesc.h index b75f6eb7b..1003c8016 100644 --- a/gst/mpegtsparse/gstmpegdesc.h +++ b/gst/mpegtsparse/gstmpegdesc.h @@ -292,6 +292,7 @@ typedef struct { guint8 *data; } GstMPEGDescriptor; +void gst_mpegtsdesc_init_debug (); GstMPEGDescriptor* gst_mpeg_descriptor_parse (guint8 *data, guint size); void gst_mpeg_descriptor_free (GstMPEGDescriptor *desc); diff --git a/gst/mpegtsparse/mpegtsparse.c b/gst/mpegtsparse/mpegtsparse.c index 6b79d9f6d..e625e7bab 100644 --- a/gst/mpegtsparse/mpegtsparse.c +++ b/gst/mpegtsparse/mpegtsparse.c @@ -28,6 +28,7 @@ #include <stdlib.h> #include "mpegtsparse.h" +#include "gstmpegdesc.h" /* latency in mseconds */ #define TS_LATENCY 700 @@ -1202,6 +1203,7 @@ plugin_init (GstPlugin * plugin) "MPEG transport stream parser"); mpegts_packetizer_init_debug (); + gst_mpegtsdesc_init_debug (); return gst_element_register (plugin, "mpegtsparse", GST_RANK_NONE, GST_TYPE_MPEGTS_PARSE); |