mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

[056/906] * configure.ac: Readd pre-pkgconfig OpenGL detection, since pkgconfig requires Mesa from git master. * gst/gl/glimagesink.c: * gst/gl/gstopengl.c: Move debug category initialization to element. * gst-libs/gst/gl/Makefile.am: * gst-libs/gst/gl/gstglfilter.c: * gst-libs/gst/gl/gstglfilter.h: * gst/gl/gstglfilter.c: * gst/gl/gstglfilter.h: Move glfilter to library. * pkgconfig/gstreamer-plugins-gl.pc.in: Add gstreamer-base-0.10 as a requirement. * po/en.po: Update.

Browse source
This commit is contained in:
David Schleef 2008-01-31 20:21:26 +00:00 committed by Matthew Waters
parent 38699b8db5
commit 0a3e152339
5 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/gl/Makefile.am
View file

@ -4,13 +4,15 @@ lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la
libgstgl_@GST_MAJORMINOR@_la_SOURCES = \ libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
glextensions.c \ glextensions.c \
gstglbuffer.c \ gstglbuffer.c \
gstgldisplay.c gstgldisplay.c \
gstglfilter.c
libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl
libgstgl_@GST_MAJORMINOR@include_HEADERS = \ libgstgl_@GST_MAJORMINOR@include_HEADERS = \
glextensions.h \ glextensions.h \
gstglbuffer.h \ gstglbuffer.h \
gstgldisplay.h gstgldisplay.h \
gstglfilter.h
libgstgl_@GST_MAJORMINOR@_la_LIBADD = \ libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \ $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \

0
gst/gl/gstglfilter.c → gst-libs/gst/gl/gstglfilter.c
View file

0
gst/gl/gstglfilter.h → gst-libs/gst/gl/gstglfilter.h
View file

8
gst/gl/glimagesink.c
View file

@ -98,8 +98,14 @@ enum
ARG_DISPLAY ARG_DISPLAY
}; };
#define DEBUG_INIT(bla) do { \
GST_DEBUG_CATEGORY_INIT (gst_debug_glimage_sink, "glimagesink", 0, "glimagesink element"); \
gst_glimage_sink_init_interfaces(bla); \
}while(0);
GST_BOILERPLATE_FULL (GstGLImageSink, gst_glimage_sink, GstVideoSink, GST_BOILERPLATE_FULL (GstGLImageSink, gst_glimage_sink, GstVideoSink,
GST_TYPE_VIDEO_SINK, gst_glimage_sink_init_interfaces); GST_TYPE_VIDEO_SINK, DEBUG_INIT);
static void static void
gst_glimage_sink_init_interfaces (GType type) gst_glimage_sink_init_interfaces (GType type)

7
gst/gl/gstopengl.c
View file

@ -42,9 +42,6 @@ GType gst_gl_test_src_get_type (void);
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (gst_debug_glimage_sink, "glimagesink", 0,
"glimagesink element");
if (!gst_element_register (plugin, "glimagesink", if (!gst_element_register (plugin, "glimagesink",
GST_RANK_SECONDARY, GST_TYPE_GLIMAGE_SINK)) { GST_RANK_SECONDARY, GST_TYPE_GLIMAGE_SINK)) {
return FALSE; return FALSE;
@ -75,6 +72,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"glimagesink", "opengl",
"OpenGL video output plugin", "plugin for elements using OpenGL",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)