12e947
diff -up firefox-102.0/media/ffvpx/config_common.h.dav1d-remove firefox-102.0/media/ffvpx/config_common.h
12e947
--- firefox-102.0/media/ffvpx/config_common.h.dav1d-remove	2022-08-08 12:48:33.218128539 +0200
12e947
+++ firefox-102.0/media/ffvpx/config_common.h	2022-08-08 12:48:52.986003374 +0200
12e947
@@ -24,15 +24,11 @@
12e947
 #undef CONFIG_VP8_VAAPI_HWACCEL
12e947
 #undef CONFIG_VP9_VAAPI_HWACCEL
12e947
 #undef CONFIG_AV1_VAAPI_HWACCEL
12e947
-#undef CONFIG_LIBDAV1D
12e947
-#undef CONFIG_AV1_DECODER
12e947
 #define CONFIG_VAAPI 1
12e947
 #define CONFIG_VAAPI_1 1
12e947
 #define CONFIG_VP8_VAAPI_HWACCEL 1
12e947
 #define CONFIG_VP9_VAAPI_HWACCEL 1
12e947
 #define CONFIG_AV1_VAAPI_HWACCEL 1
12e947
-#define CONFIG_LIBDAV1D 1
12e947
-#define CONFIG_AV1_DECODER 1
12e947
 #endif
12e947
 
12e947
 #endif
12e947
diff -up firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove firefox-102.0/media/ffvpx/libavcodec/moz.build
12e947
--- firefox-102.0/media/ffvpx/libavcodec/moz.build.dav1d-remove	2022-08-08 12:44:24.098710736 +0200
12e947
+++ firefox-102.0/media/ffvpx/libavcodec/moz.build	2022-08-08 12:46:42.635828719 +0200
12e947
@@ -104,17 +104,23 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
12e947
     ]
12e947
     if CONFIG['MOZ_WAYLAND']:
12e947
         LOCAL_INCLUDES += ['/media/mozva']
12e947
+        if CONFIG['MOZ_DAV1D_ASM']:
12e947
+            SOURCES += [
12e947
+                'libdav1d.c',
12e947
+            ]
12e947
         SOURCES += [
12e947
             'atsc_a53.c',
12e947
-            'libdav1d.c',
12e947
             'vaapi_av1.c',
12e947
             'vaapi_decode.c',
12e947
             'vaapi_vp8.c',
12e947
             'vaapi_vp9.c',
12e947
         ]
12e947
+        if CONFIG['MOZ_DAV1D_ASM']:
12e947
+            USE_LIBS += [
12e947
+                'dav1d',
12e947
+                'media_libdav1d_asm',
12e947
+            ]
12e947
         USE_LIBS += [
12e947
-          'dav1d',
12e947
-          'media_libdav1d_asm',
12e947
           'mozva'
12e947
         ]
12e947