diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
index 43dcb00409b7..aac1aa7baba7 100644
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
@@ -29,7 +29,7 @@
 #  include "va/va.h"
 #endif
 
-#if defined(MOZ_AV1) && \
+#if defined(MOZ_AV1) && defined(MOZ_WIDGET_GTK) && \
     (defined(FFVPX_VERSION) || LIBAVCODEC_VERSION_MAJOR >= 59)
 #  define FFMPEG_AV1_DECODE 1
 #  include "AOMDecoder.h"
diff --git a/media/ffvpx/config_android64.h b/media/ffvpx/config_android64.h
index 1cccf459f26a..8eb0b2a07382 100644
--- a/media/ffvpx/config_android64.h
+++ b/media/ffvpx/config_android64.h
@@ -10,7 +10,7 @@
 #define OS_NAME linux
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".so"
 #define HAVE_MMX2 HAVE_MMXEXT
@@ -479,7 +479,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
-#define CONFIG_LIBDAV1D 1
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
diff --git a/media/ffvpx/config_android_x86_64.h b/media/ffvpx/config_android_x86_64.h
index 3f1c28d9d273..a784a7f09f41 100644
--- a/media/ffvpx/config_android_x86_64.h
+++ b/media/ffvpx/config_android_x86_64.h
@@ -10,7 +10,7 @@
 #define OS_NAME linux
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".so"
 #define HAVE_MMX2 HAVE_MMXEXT
@@ -479,7 +479,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
-#define CONFIG_LIBDAV1D 1
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
diff --git a/media/ffvpx/config_darwin64.h b/media/ffvpx/config_darwin64.h
index 3606d4ace9ac..24d52dbebb9e 100644
--- a/media/ffvpx/config_darwin64.h
+++ b/media/ffvpx/config_darwin64.h
@@ -439,7 +439,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
-#define CONFIG_LIBDAV1D 1
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
diff --git a/media/ffvpx/config_darwin_aarch64.h b/media/ffvpx/config_darwin_aarch64.h
index 29bcbea98ef9..25e57a055104 100644
--- a/media/ffvpx/config_darwin_aarch64.h
+++ b/media/ffvpx/config_darwin_aarch64.h
@@ -479,7 +479,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
-#define CONFIG_LIBDAV1D 1
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
diff --git a/media/ffvpx/config_win32.h b/media/ffvpx/config_win32.h
index 3b1f101094d2..4989bd269d4a 100644
--- a/media/ffvpx/config_win32.h
+++ b/media/ffvpx/config_win32.h
@@ -474,7 +474,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
-#define CONFIG_LIBDAV1D 1
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
diff --git a/media/ffvpx/config_win64.h b/media/ffvpx/config_win64.h
index c1e66e703d82..d22a2b124087 100644
--- a/media/ffvpx/config_win64.h
+++ b/media/ffvpx/config_win64.h
@@ -10,7 +10,7 @@
 #define OS_NAME win32
 #define av_restrict restrict
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
@@ -474,7 +474,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
-#define CONFIG_LIBDAV1D 1
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0
diff --git a/media/ffvpx/config_win64_aarch64.h b/media/ffvpx/config_win64_aarch64.h
index f1c7c183f129..c61f6ab16ed2 100644
--- a/media/ffvpx/config_win64_aarch64.h
+++ b/media/ffvpx/config_win64_aarch64.h
@@ -9,7 +9,7 @@
 #define CC_IDENT "Microsoft (R) C/C++ Optimizing Compiler Version 19.24.28315 for ARM64"
 #define av_restrict __restrict
 #define EXTERN_PREFIX ""
-#define EXTERN_ASM
+#define EXTERN_ASM 
 #define BUILDSUF ""
 #define SLIBSUF ".dll"
 #define HAVE_MMX2 HAVE_MMXEXT
@@ -439,7 +439,7 @@
 #define CONFIG_LIBCACA 0
 #define CONFIG_LIBCELT 0
 #define CONFIG_LIBCODEC2 0
-#define CONFIG_LIBDAV1D 1
+#define CONFIG_LIBDAV1D 0
 #define CONFIG_LIBDC1394 0
 #define CONFIG_LIBDRM 0
 #define CONFIG_LIBFLITE 0