diff options
| author | Seungha Yang <seungha.yang@navercorp.com> | 2018-07-18 19:53:26 +0900 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-07-19 12:22:34 +0100 |
| commit | 83c7dd233568c1774afdb7958940401aeef38020 (patch) | |
| tree | 2af963a6c7e0cde610cda0308c9d8fb5fe5fc0d9 /sys | |
| parent | 63cf6b42033aa8f3fb0b007517a6dd02a81690a4 (diff) | |
| download | gst-plugins-base-83c7dd233568c1774afdb7958940401aeef38020.tar.gz gst-plugins-base-83c7dd233568c1774afdb7958940401aeef38020.tar.xz | |
xvimage: Fix symbol redefine build error
https://bugzilla.gnome.org/show_bug.cgi?id=796827
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/xvimage/xvimage.c | 3 | ||||
| -rw-r--r-- | sys/xvimage/xvimagesink.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/xvimage/xvimage.c b/sys/xvimage/xvimage.c index 66bd180c9..e0295bc69 100644 --- a/sys/xvimage/xvimage.c +++ b/sys/xvimage/xvimage.c @@ -26,7 +26,6 @@ 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 (CAT_PERFORMANCE); static gboolean plugin_init (GstPlugin * plugin) @@ -42,8 +41,6 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_pool, "xvimagepool", 0, "xvimagepool object"); - GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE"); - return TRUE; } diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 322117cc6..50d9dd28c 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -133,8 +133,8 @@ #include <X11/XKBlib.h> GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_image_sink); -GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE); #define GST_CAT_DEFAULT gst_debug_xv_image_sink +GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); typedef struct { @@ -963,7 +963,7 @@ gst_xv_image_sink_show_frame (GstVideoSink * vsink, GstBuffer * buf) if (res != GST_FLOW_OK) goto no_buffer; - GST_CAT_LOG_OBJECT (CAT_PERFORMANCE, xvimagesink, + GST_CAT_LOG_OBJECT (GST_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)) @@ -2045,4 +2045,6 @@ gst_xv_image_sink_class_init (GstXvImageSinkClass * klass) videosink_class->show_frame = GST_DEBUG_FUNCPTR (gst_xv_image_sink_show_frame); + + GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE"); } |