Commit 0dd66648 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

gl: fix up a few more #if HAVE_FOO

error: "HAVE_PNG" is not defined, evaluates to 0 [-Werror=undef]
parent f216fff3
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
#ifdef HAVE_VIDEO_AGGREGATOR_IN_BASE #ifdef HAVE_VIDEO_AGGREGATOR_IN_BASE
#include "gstglmosaic.h" #include "gstglmosaic.h"
#endif #endif
#if HAVE_PNG #ifdef HAVE_PNG
#include "gstgldifferencematte.h" #include "gstgldifferencematte.h"
/* #include "gstglbumper.h" */ /* #include "gstglbumper.h" */
#endif /* HAVE_PNG */ #endif /* HAVE_PNG */
...@@ -268,7 +268,7 @@ plugin_init (GstPlugin * plugin) ...@@ -268,7 +268,7 @@ plugin_init (GstPlugin * plugin)
return FALSE; return FALSE;
} }
#endif #endif
#if HAVE_PNG #ifdef HAVE_PNG
if (!gst_element_register (plugin, "gldifferencematte", if (!gst_element_register (plugin, "gldifferencematte",
GST_RANK_NONE, gst_gl_differencematte_get_type ())) { GST_RANK_NONE, gst_gl_differencematte_get_type ())) {
return FALSE; return FALSE;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* specified and must only be activated in a single thread. * specified and must only be activated in a single thread.
*/ */
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* either be a user visible window (onscreen) or hidden (offscreen). * either be a user visible window (onscreen) or hidden (offscreen).
*/ */
#if HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
......
...@@ -187,7 +187,7 @@ GST_START_TEST (test_glfilterapp) ...@@ -187,7 +187,7 @@ GST_START_TEST (test_glfilterapp)
GST_END_TEST GST_END_TEST
#ifdef HAVE_PNG #ifdef HAVE_PNG
#if HAVE_JPEG #ifdef HAVE_JPEG
GST_START_TEST (test_gloverlay) GST_START_TEST (test_gloverlay)
{ {
const gchar *s; const gchar *s;
...@@ -337,7 +337,7 @@ gl_launch_lines_suite (void) ...@@ -337,7 +337,7 @@ gl_launch_lines_suite (void)
tcase_add_test (tc_chain, test_glshader); tcase_add_test (tc_chain, test_glshader);
tcase_add_test (tc_chain, test_glfilterapp); tcase_add_test (tc_chain, test_glfilterapp);
#ifdef HAVE_PNG #ifdef HAVE_PNG
#if HAVE_JPEG #ifdef HAVE_JPEG
tcase_add_test (tc_chain, test_gloverlay); tcase_add_test (tc_chain, test_gloverlay);
#endif #endif
#endif #endif
...@@ -354,7 +354,7 @@ gl_launch_lines_suite (void) ...@@ -354,7 +354,7 @@ gl_launch_lines_suite (void)
#ifdef HAVE_PNG #ifdef HAVE_PNG
tcase_add_test (tc_chain, test_gldifferencematte); tcase_add_test (tc_chain, test_gldifferencematte);
/* tcase_add_test (tc_chain, test_glbumper);*/ /* tcase_add_test (tc_chain, test_glbumper);*/
#if HAVE_JPEG #ifdef HAVE_JPEG
#endif /* HAVE_JPEG */ #endif /* HAVE_JPEG */
#endif /* HAVE_PNG */ #endif /* HAVE_PNG */
#endif /* GST_GL_HAVE_OPENGL */ #endif /* GST_GL_HAVE_OPENGL */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment