FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[215/906] glbumper is compiled only when having GdkPixBuf. And update win32 codeblocks build

Browse Source
This commit is contained in:
Julien Isorce 2008-09-07 14:17:57 +02:00 committed by Matthew Waters
parent 690b684d93
commit be8d0806d8
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gst/gl/Makefile.am
View File

@ -25,8 +25,6 @@ libgstopengl_la_SOURCES = \
gltestsrc.h \ gltestsrc.h \
gstgltestsrc.c \ gstgltestsrc.c \
gstgltestsrc.h \ gstgltestsrc.h \
gstglbumper.c \
gstglbumber.h \
gstgleffects.c \ gstgleffects.c \
gstgleffects.h \ gstgleffects.h \
effects/gstgleffectssources.c \ effects/gstgleffectssources.c \
@ -47,7 +45,10 @@ libgstopengl_la_SOURCES = \
effects/gstgleffectglow.c effects/gstgleffectglow.c
if HAVE_GDKPIXBUF if HAVE_GDKPIXBUF
libgstopengl_la_SOURCES += gstglpixbufoverlay.c gstgldifferencematte.c libgstopengl_la_SOURCES += gstglpixbufoverlay.c \
gstgldifferencematte.c \
gstglbumper.c \
gstglbumber.h
endif endif
# check order of CFLAGS and LIBS, shouldn't the order be the other way around # check order of CFLAGS and LIBS, shouldn't the order be the other way around

12
gst/gl/gstopengl.c
View File

@ -34,7 +34,6 @@
#include "gstglbumper.h" #include "gstglbumper.h"
GType gst_gl_effects_get_type (void); GType gst_gl_effects_get_type (void);
GType gst_gl_bumper_get_type (void);
GType gst_gl_filter_app_get_type (void); GType gst_gl_filter_app_get_type (void);
GType gst_gl_filter_cube_get_type (void); GType gst_gl_filter_cube_get_type (void);
GType gst_gl_filterblur_get_type (void); GType gst_gl_filterblur_get_type (void);
@ -43,6 +42,7 @@ GType gst_gl_filter_laplacian_get_type (void);
#ifdef HAVE_GDKPIXBUF #ifdef HAVE_GDKPIXBUF
GType gst_gl_pixbufoverlay_get_type (void); GType gst_gl_pixbufoverlay_get_type (void);
GType gst_gl_differencematte_get_type (void); GType gst_gl_differencematte_get_type (void);
GType gst_gl_bumper_get_type (void);
#endif #endif
#define GST_CAT_DEFAULT gst_gl_gstgl_debug #define GST_CAT_DEFAULT gst_gl_gstgl_debug
@ -77,7 +77,10 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, gst_gl_differencematte_get_type())) { GST_RANK_NONE, gst_gl_differencematte_get_type())) {
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "glbumper",
GST_RANK_NONE, gst_gl_bumper_get_type())) {
return FALSE;
}
#endif #endif
if (!gst_element_register (plugin, "gleffects", if (!gst_element_register (plugin, "gleffects",
@ -85,11 +88,6 @@ plugin_init (GstPlugin * plugin)
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "glbumper",
GST_RANK_NONE, gst_gl_bumper_get_type())) {
return FALSE;
}
if (!gst_element_register (plugin, "glfilterblur", if (!gst_element_register (plugin, "glfilterblur",
GST_RANK_NONE, gst_gl_filterblur_get_type())) { GST_RANK_NONE, gst_gl_filterblur_get_type())) {
return FALSE; return FALSE;