From 67adf511fd1554582a22003521a743e526211635 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Thu, 20 May 2010 09:56:25 +0200
Subject: [PATCH] [MOVED FROM BAD 024/134] vp8: Undef HAVE_CONFIG_H before
 including libvpx headers

A public libvpx header includes private headers if this is
defined, causing compilation failures because the private headers
are not installed of course.
---
 ext/vp8/gstvp8dec.c   | 6 ++++++
 ext/vp8/gstvp8enc.c   | 5 +++++
 ext/vp8/gstvp8utils.c | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/ext/vp8/gstvp8dec.c b/ext/vp8/gstvp8dec.c
index 168024b..60a93b7 100644
--- a/ext/vp8/gstvp8dec.c
+++ b/ext/vp8/gstvp8dec.c
@@ -33,6 +33,12 @@
 #include <string.h>
 #include <math.h>
 
+/* FIXME: Undef HAVE_CONFIG_H because vpx_codec.h uses it,
+ * which causes compilation failures */
+#ifdef HAVE_CONFIG_H
+#undef HAVE_CONFIG_H
+#endif
+
 #include <vpx/vpx_decoder.h>
 #include <vpx/vp8dx.h>
 
diff --git a/ext/vp8/gstvp8enc.c b/ext/vp8/gstvp8enc.c
index 6f2ab16..e39a454 100644
--- a/ext/vp8/gstvp8enc.c
+++ b/ext/vp8/gstvp8enc.c
@@ -34,6 +34,11 @@
 #include <string.h>
 #include <math.h>
 
+/* FIXME: Undef HAVE_CONFIG_H because vpx_codec.h uses it,
+ * which causes compilation failures */
+#ifdef HAVE_CONFIG_H
+#undef HAVE_CONFIG_H
+#endif
 
 #include <vpx/vpx_encoder.h>
 #include <vpx/vp8cx.h>
diff --git a/ext/vp8/gstvp8utils.c b/ext/vp8/gstvp8utils.c
index e206780..90df09b 100644
--- a/ext/vp8/gstvp8utils.c
+++ b/ext/vp8/gstvp8utils.c
@@ -25,6 +25,13 @@
 #endif
 
 #include <gst/gst.h>
+
+/* FIXME: Undef HAVE_CONFIG_H because vpx_codec.h uses it,
+ * which causes compilation failures */
+#ifdef HAVE_CONFIG_H
+#undef HAVE_CONFIG_H
+#endif
+
 #include <vpx/vpx_codec.h>
 
 #include "gstvp8utils.h"
-- 
2.7.4