mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

xvimage: Fix symbol redefine build error

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=796827
This commit is contained in:
Seungha Yang 2018-07-18 19:53:26 +09:00 committed by Tim-Philipp Müller
parent 63cf6b4203
commit 83c7dd2335
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/xvimage/xvimage.c
View file

@ -26,7 +26,6 @@
GST_DEBUG_CATEGORY (gst_debug_xv_context); GST_DEBUG_CATEGORY (gst_debug_xv_context);
GST_DEBUG_CATEGORY (gst_debug_xv_image_pool); GST_DEBUG_CATEGORY (gst_debug_xv_image_pool);
GST_DEBUG_CATEGORY (gst_debug_xv_image_sink); GST_DEBUG_CATEGORY (gst_debug_xv_image_sink);
GST_DEBUG_CATEGORY (CAT_PERFORMANCE);
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
@ -42,8 +41,6 @@ plugin_init (GstPlugin * plugin)
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_pool, "xvimagepool", 0, GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_pool, "xvimagepool", 0,
"xvimagepool object"); "xvimagepool object");
GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE");
return TRUE; return TRUE;
} }

6
sys/xvimage/xvimagesink.c
View file

@ -133,8 +133,8 @@
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_image_sink); GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_image_sink);
GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE);
#define GST_CAT_DEFAULT gst_debug_xv_image_sink #define GST_CAT_DEFAULT gst_debug_xv_image_sink
GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
typedef struct typedef struct
{ {
@ -963,7 +963,7 @@ gst_xv_image_sink_show_frame (GstVideoSink * vsink, GstBuffer * buf)
if (res != GST_FLOW_OK) if (res != GST_FLOW_OK)
goto no_buffer; 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); "slow copy buffer %p into bufferpool buffer %p", buf, to_put);
if (!gst_video_frame_map (&src, &xvimagesink->info, buf, GST_MAP_READ)) 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 = videosink_class->show_frame =
GST_DEBUG_FUNCPTR (gst_xv_image_sink_show_frame); GST_DEBUG_FUNCPTR (gst_xv_image_sink_show_frame);
GST_DEBUG_CATEGORY_GET (GST_CAT_PERFORMANCE, "GST_PERFORMANCE");
} }