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

[474/906] build: make libjpeg use conditional

Browse Source 
Disable gloverlay element if we do not hve libjpeg
This commit is contained in:
Julien Isorce 2011-11-18 11:52:10 +01:00 committed by Matthew Waters
parent a7587aa44e
commit 533e180ce8
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gst/gl/Makefile.am
View File

@ -50,11 +50,14 @@ OPENGL_SOURCES += \
gstglbumper.c \ gstglbumper.c \
gstglbumper.h \ gstglbumper.h \
gstgldifferencematte.c \ gstgldifferencematte.c \
gstgldifferencematte.h \ gstgldifferencematte.h
if HAVE_JPEG
OPENGL_SOURCES += \
gstgloverlay.c \ gstgloverlay.c \
gstgloverlay.h gstgloverlay.h
endif endif
endif endif
endif
libgstopengl_la_SOURCES = \ libgstopengl_la_SOURCES = \
gstopengl.c \ gstopengl.c \

20
gst/gl/gstopengl.c
View File

@ -62,7 +62,6 @@ GType gst_gl_effects_get_type (void);
#include "gstglfiltershader.h" #include "gstglfiltershader.h"
#include "gstglcolorscale.h" #include "gstglcolorscale.h"
#include "gstgldeinterlace.h" #include "gstgldeinterlace.h"
#include "gstglbumper.h"
#include "gstglmosaic.h" #include "gstglmosaic.h"
GType gst_gl_deinterlace_get_type (void); GType gst_gl_deinterlace_get_type (void);
@ -73,10 +72,22 @@ GType gst_gl_filtershader_get_type (void);
GType gst_gl_filtersobel_get_type (void); GType gst_gl_filtersobel_get_type (void);
GType gst_gl_filter_laplacian_get_type (void); GType gst_gl_filter_laplacian_get_type (void);
GType gst_gl_filter_glass_get_type (void); GType gst_gl_filter_glass_get_type (void);
GType gst_gl_overlay_get_type (void); GType gst_gl_mosaic_get_type (void);
#ifdef HAVE_PNG
#include "gstgldifferencematte.h"
#include "gstglbumper.h"
GType gst_gl_differencematte_get_type (void); GType gst_gl_differencematte_get_type (void);
GType gst_gl_bumper_get_type (void); GType gst_gl_bumper_get_type (void);
GType gst_gl_mosaic_get_type (void);
#ifdef HAVE_JPEG
#include "gstgloverlay.h"
GType gst_gl_overlay_get_type (void);
#endif
#endif
#endif #endif
#define GST_CAT_DEFAULT gst_gl_gstgl_debug #define GST_CAT_DEFAULT gst_gl_gstgl_debug
@ -177,12 +188,13 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, gst_gl_bumper_get_type ())) { GST_RANK_NONE, gst_gl_bumper_get_type ())) {
return FALSE; return FALSE;
} }
#ifdef HAVE_JPEG
if (!gst_element_register (plugin, "gloverlay", if (!gst_element_register (plugin, "gloverlay",
GST_RANK_NONE, gst_gl_overlay_get_type ())) { GST_RANK_NONE, gst_gl_overlay_get_type ())) {
return FALSE; return FALSE;
} }
#endif #endif
#endif
#endif #endif
return TRUE; return TRUE;