gl: fix up a few more #if HAVE_FOO

error: "HAVE_PNG" is not defined, evaluates to 0 [-Werror=undef]
This commit is contained in:
Tim-Philipp Müller 2017-12-19 16:51:24 +00:00
parent f216fff3dd
commit 0dd66648c3
5 changed files with 8 additions and 8 deletions

View file

@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
#if HAVE_CONFIG_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

View file

@ -85,7 +85,7 @@
#ifdef HAVE_VIDEO_AGGREGATOR_IN_BASE
#include "gstglmosaic.h"
#endif
#if HAVE_PNG
#ifdef HAVE_PNG
#include "gstgldifferencematte.h"
/* #include "gstglbumper.h" */
#endif /* HAVE_PNG */
@ -268,7 +268,7 @@ plugin_init (GstPlugin * plugin)
return FALSE;
}
#endif
#if HAVE_PNG
#ifdef HAVE_PNG
if (!gst_element_register (plugin, "gldifferencematte",
GST_RANK_NONE, gst_gl_differencematte_get_type ())) {
return FALSE;

View file

@ -29,7 +29,7 @@
* specified and must only be activated in a single thread.
*/
#if HAVE_CONFIG_H
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

View file

@ -28,7 +28,7 @@
* either be a user visible window (onscreen) or hidden (offscreen).
*/
#if HAVE_CONFIG_H
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif

View file

@ -187,7 +187,7 @@ GST_START_TEST (test_glfilterapp)
GST_END_TEST
#ifdef HAVE_PNG
#if HAVE_JPEG
#ifdef HAVE_JPEG
GST_START_TEST (test_gloverlay)
{
const gchar *s;
@ -337,7 +337,7 @@ gl_launch_lines_suite (void)
tcase_add_test (tc_chain, test_glshader);
tcase_add_test (tc_chain, test_glfilterapp);
#ifdef HAVE_PNG
#if HAVE_JPEG
#ifdef HAVE_JPEG
tcase_add_test (tc_chain, test_gloverlay);
#endif
#endif
@ -354,7 +354,7 @@ gl_launch_lines_suite (void)
#ifdef HAVE_PNG
tcase_add_test (tc_chain, test_gldifferencematte);
/* tcase_add_test (tc_chain, test_glbumper);*/
#if HAVE_JPEG
#ifdef HAVE_JPEG
#endif /* HAVE_JPEG */
#endif /* HAVE_PNG */
#endif /* GST_GL_HAVE_OPENGL */