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 #include #include -#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 +#include + +/* +* 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 + #include #include #include -#include -#include - G_BEGIN_DECLS #define GST_TYPE_SVTAV1ENC (gst_svtav1enc_get_type())