From 2b38f8faa5faae5872817c22ff930e9ea36a95d4 Mon Sep 17 00:00:00 2001
From: xliska <xliska>
Date: Fri, 9 Jul 2010 15:21:58 +0000
Subject: [PATCH] Correct compilation of the Quad code.

---
 ultragrid/src/config.h.in          | 5 +++++
 ultragrid/src/video_capture.c      | 5 +++--
 ultragrid/src/video_capture/quad.c | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ultragrid/src/config.h.in b/ultragrid/src/config.h.in
index 2bd62bd76..2cfba3037 100644
--- a/ultragrid/src/config.h.in
+++ b/ultragrid/src/config.h.in
@@ -38,6 +38,11 @@
  */
 #undef HAVE_DECKLINK
 
+/* 
+ * Define this is you have a Quad SDI card
+ */
+#undef HAVE_QUAD
+
 /*
  * Define this if you want FastDXT support
  */
diff --git a/ultragrid/src/video_capture.c b/ultragrid/src/video_capture.c
index 43fb8ff73..c9f33b6da 100644
--- a/ultragrid/src/video_capture.c
+++ b/ultragrid/src/video_capture.c
@@ -47,8 +47,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Revision: 1.9 $
- * $Date: 2009/12/11 15:29:39 $
+ * $Revision: 1.10 $
+ * $Date: 2010/07/09 15:21:58 $
  *
  */
 
@@ -64,6 +64,7 @@
 #include "video_capture/testcard.h"
 #include "video_capture/null.h"
 #include "video_capture/decklink.h"
+#include "video_capture/quad.h"
 
 #define VIDCAP_MAGIC	0x76ae98f0
 
diff --git a/ultragrid/src/video_capture/quad.c b/ultragrid/src/video_capture/quad.c
index 31812fcc0..05d7b631f 100644
--- a/ultragrid/src/video_capture/quad.c
+++ b/ultragrid/src/video_capture/quad.c
@@ -49,13 +49,13 @@
 #include "config_unix.h"
 #include "config_win32.h"
 
-#ifndef HAVE_MACOSX
-#ifdef HAVE_QUAD		/* From config.h */
-
 #include "debug.h"
 #include "video_types.h"
 #include "video_capture.h"
 
+#ifndef HAVE_MACOSX
+#ifdef HAVE_QUAD		/* From config.h */
+
 #include "video_capture/quad.h"
 
 #include <stdio.h>