From 9a49a81c2206be4df3a3a37676bbfc63362d165f Mon Sep 17 00:00:00 2001
From: David Hoyt <dhoyt@llnl.gov>
Date: Tue, 9 Mar 2010 01:24:06 +0100
Subject: [PATCH] [414/906] glbumper/gldifferencematte/gloverlay: libpng 1.4.x
 compatible

Fix bug #608643
---
 gst/gl/gstglbumper.c          | 5 +++++
 gst/gl/gstgldifferencematte.c | 5 +++++
 gst/gl/gstgloverlay.c         | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/gst/gl/gstglbumper.c b/gst/gl/gstglbumper.c
index f7cf6d94b5..3a6147d2f5 100644
--- a/gst/gl/gstglbumper.c
+++ b/gst/gl/gstglbumper.c
@@ -41,6 +41,11 @@
 #include <png.h>
 #include "gstglbumper.h"
 
+#if PNG_LIBPNG_VER >= 10400
+#define int_p_NULL         NULL
+#define png_infopp_NULL    NULL
+#endif
+
 #define GST_CAT_DEFAULT gst_gl_bumper_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
diff --git a/gst/gl/gstgldifferencematte.c b/gst/gl/gstgldifferencematte.c
index 6f0e699108..885367f51e 100644
--- a/gst/gl/gstgldifferencematte.c
+++ b/gst/gl/gstgldifferencematte.c
@@ -41,6 +41,11 @@
 #include "gstgldifferencematte.h"
 #include <gstgleffectssources.h>
 
+#if PNG_LIBPNG_VER >= 10400
+#define int_p_NULL         NULL
+#define png_infopp_NULL    NULL
+#endif
+
 #define GST_CAT_DEFAULT gst_gl_differencematte_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
diff --git a/gst/gl/gstgloverlay.c b/gst/gl/gstgloverlay.c
index 21d855564c..e2f7094f23 100644
--- a/gst/gl/gstgloverlay.c
+++ b/gst/gl/gstgloverlay.c
@@ -41,6 +41,11 @@
 #include "gstgloverlay.h"
 #include <gstgleffectssources.h>
 
+#if PNG_LIBPNG_VER >= 10400
+#define int_p_NULL         NULL
+#define png_infopp_NULL    NULL
+#endif
+
 #define GST_CAT_DEFAULT gst_gl_overlay_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);