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

[472/906] linpng: make libpng use conditional

Browse Source 
Disable 3 elements if we don't have libpng.
This commit is contained in:
Stefan Sauer 2011-11-18 08:08:18 +01:00 committed by Matthew Waters
parent 268f1a30b2
commit aacf88ffa5
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gst/gl/Makefile.am
View File

@ -7,8 +7,6 @@ AM_LIBS = $(GST_BASE_LIBS)
# full opengl required # full opengl required
if GL_IS_OPENGL if GL_IS_OPENGL
OPENGL_SOURCES = \ OPENGL_SOURCES = \
gstglbumper.c \
gstglbumper.h \
gstglfiltershader.c \ gstglfiltershader.c \
gstglfiltershader.h \ gstglfiltershader.h \
gstglfilterblur.c \ gstglfilterblur.c \
@ -27,16 +25,12 @@ OPENGL_SOURCES = \
gstglcolorscale.h \ gstglcolorscale.h \
gstgldeinterlace.c \ gstgldeinterlace.c \
gstgldeinterlace.h \ gstgldeinterlace.h \
gstgldifferencematte.c \
gstgldifferencematte.h \
gstgloverlay.c \
gltestsrc.c \ gltestsrc.c \
gltestsrc.h \ gltestsrc.h \
gstgltestsrc.c \ gstgltestsrc.c \
gstgltestsrc.h \ gstgltestsrc.h \
gstglmosaic.c \ gstglmosaic.c \
gstglmosaic.h \ gstglmosaic.h \
gstgloverlay.h \
effects/gstgleffectscurves.h \ effects/gstgleffectscurves.h \
effects/gstgleffectstretch.c \ effects/gstgleffectstretch.c \
effects/gstgleffecttunnel.c \ effects/gstgleffecttunnel.c \
@ -50,6 +44,16 @@ OPENGL_SOURCES = \
effects/gstgleffectsin.c \ effects/gstgleffectsin.c \
effects/gstgleffectglow.c \ effects/gstgleffectglow.c \
effects/gstgleffectxray.c effects/gstgleffectxray.c
if HAVE_PNG
OPENGL_SOURCES += \
gstglbumper.c \
gstglbumper.h \
gstgldifferencematte.c \
gstgldifferencematte.h \
gstgloverlay.c \
gstgloverlay.h
endif
endif endif
libgstopengl_la_SOURCES = \ libgstopengl_la_SOURCES = \

30
gst/gl/gstopengl.c
View File

@ -118,19 +118,6 @@ plugin_init (GstPlugin * plugin)
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "gloverlay",
GST_RANK_NONE, gst_gl_overlay_get_type ())) {
return FALSE;
}
if (!gst_element_register (plugin, "gldifferencematte",
GST_RANK_NONE, gst_gl_differencematte_get_type ())) {
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;
@ -175,10 +162,27 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_COLORSCALE)) { GST_RANK_NONE, GST_TYPE_GL_COLORSCALE)) {
return FALSE; return FALSE;
} }
if (!gst_element_register (plugin, "glmosaic", if (!gst_element_register (plugin, "glmosaic",
GST_RANK_NONE, GST_TYPE_GL_MOSAIC)) { GST_RANK_NONE, GST_TYPE_GL_MOSAIC)) {
return FALSE; return FALSE;
} }
#ifdef HAVE_PNG
if (!gst_element_register (plugin, "gldifferencematte",
GST_RANK_NONE, gst_gl_differencematte_get_type ())) {
return FALSE;
}
if (!gst_element_register (plugin, "glbumper",
GST_RANK_NONE, gst_gl_bumper_get_type ())) {
return FALSE;
}
if (!gst_element_register (plugin, "gloverlay",
GST_RANK_NONE, gst_gl_overlay_get_type ())) {
return FALSE;
}
#endif
#endif #endif
return TRUE; return TRUE;