From: <tp...@ke...> - 2009-04-10 17:07:09
|
Module: gst-plugins-bad Branch: master Commit: 2b1fcc75a740d2caa7774658eff1e6161d408c20 URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=2b1fcc75a740d2caa7774658eff1e6161d408c20 Author: Tim-Philipp Müller <tim...@co...> Date: Fri Apr 10 18:00:06 2009 +0100 dshowdec: fix compilation with the debugging system disabled One GST_DEBUG_CATEGORY_INIT should be enough anyway. Fixes #578562 (spotted by David Hoyt). --- sys/dshowdecwrapper/gstdshowaudiodec.cpp | 8 +------- sys/dshowdecwrapper/gstdshowvideodec.cpp | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/sys/dshowdecwrapper/gstdshowaudiodec.cpp b/sys/dshowdecwrapper/gstdshowaudiodec.cpp index 74f5fb1..fae5292 100644 --- a/sys/dshowdecwrapper/gstdshowaudiodec.cpp +++ b/sys/dshowdecwrapper/gstdshowaudiodec.cpp @@ -358,13 +358,7 @@ gst_dshowaudiodec_class_init (GstDshowAudioDecClass * klass) gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_dshowaudiodec_change_state); - if (!parent_class) - parent_class = (GstElementClass *)g_type_class_ref (GST_TYPE_ELEMENT); - - if (!dshowaudiodec_debug) { - GST_DEBUG_CATEGORY_INIT (dshowaudiodec_debug, "dshowaudiodec", 0, - "Directshow filter audio decoder"); - } + parent_class = (GstElementClass *) g_type_class_peek_parent (klass); } static void diff --git a/sys/dshowdecwrapper/gstdshowvideodec.cpp b/sys/dshowdecwrapper/gstdshowvideodec.cpp index 71b1510..fab9291 100644 --- a/sys/dshowdecwrapper/gstdshowvideodec.cpp +++ b/sys/dshowdecwrapper/gstdshowvideodec.cpp @@ -410,13 +410,7 @@ gst_dshowvideodec_class_init (GstDshowVideoDecClass * klass) gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_dshowvideodec_change_state); - if (!parent_class) - parent_class = (GstElementClass *)g_type_class_ref (GST_TYPE_ELEMENT); - - if (!dshowvideodec_debug) { - GST_DEBUG_CATEGORY_INIT (dshowvideodec_debug, "dshowvideodec", 0, - "Directshow filter video decoder"); - } + parent_class = (GstElementClass *) g_type_class_peek_parent (klass); } static void |