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 /sys | |
| parent | ddfe7a2808d49180f1c6395dfeed5b675737f32e (diff) | |
| download | gst-plugins-base-a62c7bd54c9361196dc6e4e9a5fefea0cb6a6893.tar.gz gst-plugins-base-a62c7bd54c9361196dc6e4e9a5fefea0cb6a6893.tar.xz | |
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 'sys')
| -rw-r--r-- | sys/ximage/ximage.c | 4 | ||||
| -rw-r--r-- | sys/ximage/ximagesink.c | 4 | ||||
| -rw-r--r-- | sys/xvimage/xvcontext.c | 1 | ||||
| -rw-r--r-- | sys/xvimage/xvimage.c | 4 | ||||
| -rw-r--r-- | sys/xvimage/xvimagesink.c | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/sys/ximage/ximage.c b/sys/ximage/ximage.c index 7b92601a9..4ccaa7fbd 100644 --- a/sys/ximage/ximage.c +++ b/sys/ximage/ximage.c @@ -25,7 +25,7 @@ GST_DEBUG_CATEGORY (gst_debug_x_image_pool); GST_DEBUG_CATEGORY (gst_debug_x_image_sink); -GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); +GST_DEBUG_CATEGORY (CAT_PERFORMANCE); static gboolean plugin_init (GstPlugin * plugin) @@ -39,7 +39,7 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (gst_debug_x_image_pool, "ximagepool", 0, "ximagepool object"); - GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE"); + GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE"); return TRUE; } diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index b95be659c..d2c8c81d9 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -119,7 +119,7 @@ #include <X11/XKBlib.h> GST_DEBUG_CATEGORY_EXTERN (gst_debug_x_image_sink); -GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); +GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE); #define GST_CAT_DEFAULT gst_debug_x_image_sink typedef struct @@ -1370,7 +1370,7 @@ gst_x_image_sink_show_frame (GstVideoSink * vsink, GstBuffer * buf) if (res != GST_FLOW_OK) goto no_buffer; - GST_CAT_LOG_OBJECT (GST_CAT_PERFORMANCE, ximagesink, + GST_CAT_LOG_OBJECT (CAT_PERFORMANCE, ximagesink, "slow copy into bufferpool buffer %p", to_put); if (!gst_video_frame_map (&src, &ximagesink->info, buf, GST_MAP_READ)) diff --git a/sys/xvimage/xvcontext.c b/sys/xvimage/xvcontext.c index 6994db385..ec87cc866 100644 --- a/sys/xvimage/xvcontext.c +++ b/sys/xvimage/xvcontext.c @@ -34,7 +34,6 @@ #include <X11/XKBlib.h> GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_context); -GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); #define GST_CAT_DEFAULT gst_debug_xv_context void diff --git a/sys/xvimage/xvimage.c b/sys/xvimage/xvimage.c index 5f2e20846..66bd180c9 100644 --- a/sys/xvimage/xvimage.c +++ b/sys/xvimage/xvimage.c @@ -26,7 +26,7 @@ GST_DEBUG_CATEGORY (gst_debug_xv_context); GST_DEBUG_CATEGORY (gst_debug_xv_image_pool); GST_DEBUG_CATEGORY (gst_debug_xv_image_sink); -GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); +GST_DEBUG_CATEGORY (CAT_PERFORMANCE); static gboolean plugin_init (GstPlugin * plugin) @@ -42,7 +42,7 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_pool, "xvimagepool", 0, "xvimagepool object"); - GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE"); + GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE"); return TRUE; } diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index c48037ed9..c61207675 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -134,7 +134,7 @@ #include <X11/XKBlib.h> GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_image_sink); -GST_DEBUG_CATEGORY_EXTERN (GST_CAT_PERFORMANCE); +GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE); #define GST_CAT_DEFAULT gst_debug_xv_image_sink typedef struct @@ -956,7 +956,7 @@ gst_xv_image_sink_show_frame (GstVideoSink * vsink, GstBuffer * buf) if (res != GST_FLOW_OK) goto no_buffer; - GST_CAT_LOG_OBJECT (GST_CAT_PERFORMANCE, xvimagesink, + GST_CAT_LOG_OBJECT (CAT_PERFORMANCE, xvimagesink, "slow copy buffer %p into bufferpool buffer %p", buf, to_put); if (!gst_video_frame_map (&src, &xvimagesink->info, buf, GST_MAP_READ)) |