From 1fb7cda048202c37c17718d09ecfd6af5b2a0220 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordan@centricular.com>
Date: Fri, 29 Sep 2023 15:07:42 +0200
Subject: [PATCH] svtav1enc: Avoid svtav1 defining TRUE/FALSE

Make sure we include the svt headers first and then undefine TRUE
and FALSE so we will only ever be using glib's defines for those.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5424>
---
 .../gst-plugins-bad/ext/svtav1/gstsvtav1enc.c |  2 +-
 .../gst-plugins-bad/ext/svtav1/gstsvtav1enc.h | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c b/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c
index 7eac6fc5ae..f796c1a111 100644
--- a/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c
+++ b/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.c
@@ -21,10 +21,10 @@
 
 #include "config.h"
 
+#include "gstsvtav1enc.h"
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/video/gstvideoencoder.h>
-#include "gstsvtav1enc.h"
 
 #if !SVT_AV1_CHECK_VERSION(1,2,1)
 #define SVT_AV1_RC_MODE_CQP_OR_CRF 0
diff --git a/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.h b/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.h
index 2ebc5b562a..16c0cbb4e7 100644
--- a/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.h
+++ b/subprojects/gst-plugins-bad/ext/svtav1/gstsvtav1enc.h
@@ -7,13 +7,28 @@
 #ifndef _GST_SVTAV1ENC_H_
 #define _GST_SVTAV1ENC_H_
 
+#include <EbSvtAv1.h>
+#include <EbSvtAv1Enc.h>
+
+/*
+* SVT-AV1 headers define TRUE and FALSE defines which can conflict
+* or replace glib's defines. This is why we include the SVT-AV1
+* headers first and the glib.h so we will only be using glib's
+* TRUE/FALSE defines.
+*/
+#ifdef TRUE
+#undef TRUE
+#endif
+#ifdef FALSE
+#undef FALSE
+#endif
+
+#include <glib.h>
+
 #include <string.h>
 #include <gst/video/video.h>
 #include <gst/video/gstvideoencoder.h>
 
-#include <EbSvtAv1.h>
-#include <EbSvtAv1Enc.h>
-
 G_BEGIN_DECLS
 
 #define GST_TYPE_SVTAV1ENC (gst_svtav1enc_get_type())