Bug 1749852 [Linux] Don't build VA-API with MOZ_FFVPX_AUDIOONLY r=jhorak

Differential Revision: https://phabricator.services.mozilla.com/D135827

media/ffvpx/config_common.h

@@ -18,7 +18,7 @@
 #define CONFIG_RDFT 1
 #endif
 
-#ifdef MOZ_WAYLAND
+#if defined(MOZ_WAYLAND) && !defined(MOZ_FFVPX_AUDIOONLY)
 #undef CONFIG_VAAPI
 #undef CONFIG_VP8_VAAPI_HWACCEL
 #undef CONFIG_VP9_VAAPI_HWACCEL

media/ffvpx/libavutil/moz.build

@@ -45,12 +45,6 @@ SOURCES += [
     'time.c',
     'utils.c'
 ]
-if CONFIG['MOZ_WAYLAND']:
-    SOURCES += [
-        'hwcontext_vaapi.c'
-    ]
-    USE_LIBS += ['mozva']
-
 if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
     SOURCES += [
         'adler32.c',
@@ -67,8 +61,10 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
     ]
     if CONFIG["MOZ_WAYLAND"]:
         SOURCES += [
+            'hwcontext_vaapi.c',
             'mastering_display_metadata.c',
         ]
+        USE_LIBS += ['mozva']
 
 SYMBOLS_FILE =  'avutil.symbols'
 NoVisibilityFlags()