diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2016-02-20 11:31:43 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2016-02-20 11:31:43 +0000 |
| commit | a62c7bd54c9361196dc6e4e9a5fefea0cb6a6893 (patch) | |
| tree | fa95c9b026a35b3e1c2b407c8b532a17ca411eb7 /gst | |
| parent | ddfe7a2808d49180f1c6395dfeed5b675737f32e (diff) | |
| download | gstreamer-plugins-base-a62c7bd54c9361196dc6e4e9a5fefea0cb6a6893.tar.gz | |
Fix use of undeclared core debug category symbols
libgstreamer currently exports some debug category
symbols GST_CAT_*, but those are not declared in any
public headers.
Some plugins and libgstvideo just use GST_DEBUG_CATEGORY_EXTERN()
to declare and use those, but that's just not right at
all, and it won't work on Windows with MSVC. Instead look
up the categories via the API.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/videoconvert/gstvideoconvert.c | 6 | ||||
| -rw-r--r-- | gst/videoscale/gstvideoscale.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gst/videoconvert/gstvideoconvert.c b/gst/videoconvert/gstvideoconvert.c index 11d560d08..66e388cd3 100644 --- a/gst/videoconvert/gstvideoconvert.c +++ b/gst/videoconvert/gstvideoconvert.c @@ -49,7 +49,7 @@ GST_DEBUG_CATEGORY (videoconvert_debug); #define GST_CAT_DEFAULT videoconvert_debug -GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); +GST_DEBUG_CATEGORY_STATIC (CAT_PERFORMANCE); GType gst_video_convert_get_type (void); @@ -684,7 +684,7 @@ gst_video_convert_transform_frame (GstVideoFilter * filter, space = GST_VIDEO_CONVERT_CAST (filter); - GST_CAT_DEBUG_OBJECT (GST_CAT_PERFORMANCE, filter, + GST_CAT_DEBUG_OBJECT (CAT_PERFORMANCE, filter, "doing colorspace conversion from %s -> to %s", GST_VIDEO_INFO_NAME (&filter->in_info), GST_VIDEO_INFO_NAME (&filter->out_info)); @@ -700,6 +700,8 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (videoconvert_debug, "videoconvert", 0, "Colorspace Converter"); + GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE"); + _colorspace_quark = g_quark_from_static_string ("colorspace"); return gst_element_register (plugin, "videoconvert", diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c index 871717b7a..b033151a9 100644 --- a/gst/videoscale/gstvideoscale.c +++ b/gst/videoscale/gstvideoscale.c @@ -80,7 +80,7 @@ #define GST_CAT_DEFAULT video_scale_debug GST_DEBUG_CATEGORY_STATIC (video_scale_debug); -GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); +GST_DEBUG_CATEGORY_STATIC (CAT_PERFORMANCE); #define DEFAULT_PROP_METHOD GST_VIDEO_SCALE_BILINEAR #define DEFAULT_PROP_ADD_BORDERS TRUE @@ -517,7 +517,7 @@ gst_video_scale_set_info (GstVideoFilter * filter, GstCaps * in, gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (filter), TRUE); } else { GstStructure *options; - GST_CAT_DEBUG_OBJECT (GST_CAT_PERFORMANCE, filter, "setup videoscaling"); + GST_CAT_DEBUG_OBJECT (CAT_PERFORMANCE, filter, "setup videoscaling"); gst_base_transform_set_passthrough (GST_BASE_TRANSFORM (filter), FALSE); options = gst_structure_new_empty ("videoscale"); @@ -1079,7 +1079,7 @@ gst_video_scale_transform_frame (GstVideoFilter * filter, GstVideoScale *videoscale = GST_VIDEO_SCALE_CAST (filter); GstFlowReturn ret = GST_FLOW_OK; - GST_CAT_DEBUG_OBJECT (GST_CAT_PERFORMANCE, filter, "doing video scaling"); + GST_CAT_DEBUG_OBJECT (CAT_PERFORMANCE, filter, "doing video scaling"); gst_video_converter_frame (videoscale->convert, in_frame, out_frame); @@ -1134,7 +1134,7 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (video_scale_debug, "videoscale", 0, "videoscale element"); - GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE"); + GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE"); return TRUE; } |