[064/906] up

git-svn-id: svn://svn.wobow.com/GStreamer_playground/gst-plugins-gl@424 93df14bb-0f41-7a43-8087-d3e2a2f0e464
This commit is contained in:
Julien Isorce 2008-05-18 16:04:56 +00:00 committed by Matthew Waters
parent 50a08f10b3
commit 3b8e186130
2 changed files with 3 additions and 2 deletions

View file

@ -18,6 +18,7 @@ libgstopengl_la_SOURCES = \
libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
-I$(top_srcdir)/gst-libs/gst/freeglut \
-I$(top_srcdir)/gst-libs/gst/gl -I$(top_srcdir)/gst-libs/gst/gl
libgstopengl_la_LIBADD = \ libgstopengl_la_LIBADD = \
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_MAJORMINOR).la \

View file

@ -15,7 +15,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
GST_DEBUG_CATEGORY_INIT (gst_gl_gstgl_debug, "gstgl", 0, "gstgl"); GST_DEBUG_CATEGORY_INIT (gst_gl_gstgl_debug, "gstopengl", 0, "gstopengl");
if (!gst_element_register (plugin, "glvideomaker", if (!gst_element_register (plugin, "glvideomaker",
GST_RANK_NONE, GST_TYPE_GL_VIDEOMAKER)) { GST_RANK_NONE, GST_TYPE_GL_VIDEOMAKER)) {
@ -37,6 +37,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"gstgl", "opengl",
"OpenGL plugin", "OpenGL plugin",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)