From a2342e6629b6a685aa3d548078d05fb417297ba0 Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Thu, 7 May 2020 14:45:42 +0300
Subject: [PATCH] Move MOZ_AV1 back to ac configure for everyone to use.

---
 build/moz.configure/old.configure |  1 +
 old-configure.in                  | 15 +++++++++++++++
 toolkit/moz.configure             | 14 --------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 40b4a3e62..ae02e70fd 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -157,6 +157,7 @@ def old_configure_options(*options):
     '--enable-accessibility',
     '--enable-address-sanitizer',
     '--enable-alsa',
+    '--enable-av1',
     '--enable-b2g-bt',
     '--enable-b2g-camera',
     '--enable-b2g-ril',
diff --git a/old-configure.in b/old-configure.in
index 9a84dc96f..765a31f16 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2121,6 +2121,7 @@ if test "$MOZ_IOS"; then
    MOZ_AUTH_EXTENSION=
 fi
 MOZ_RAW=
+MOZ_AV1=
 MOZ_VORBIS=
 MOZ_TREMOR=
 MOZ_SAMPLE_TYPE_FLOAT32=
@@ -2802,6 +2803,20 @@ fi
 
 AC_SUBST(MOZ_RAW)
 
+dnl ========================================================
+dnl = Enable Libaom AV1 Codec
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(av1,
+[  --enable-av1           Enable libaom for av1 video support],
+    MOZ_AV1=1,
+    MOZ_AV1=)
+
+if test -n "$MOZ_AV1"; then
+    AC_DEFINE(MOZ_AV1)
+fi
+
+AC_SUBST(MOZ_AV1)
+
 dnl ========================================================
 dnl = Apple platform decoder support
 dnl ========================================================
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 6d6bc5f44..2d2d5c8d0 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -371,20 +371,6 @@ set_config('MOZ_FMP4', fmp4)
 set_define('MOZ_FMP4', fmp4)
 add_old_configure_assignment('MOZ_FMP4', fmp4)
 
-# Libaom AV1 Video Codec Support
-# ==============================================================
-option('--enable-av1',
-        help='Enable libaom for av1 video support')
-
-@depends('--enable-av1')
-def av1(value):
-    enabled = bool(value)
-    if enabled:
-        return True
-
-set_config('MOZ_AV1', av1)
-set_define('MOZ_AV1', av1)
-
 # Miscellaneous
 # ==============================================================
 option(name='--enable-chrome-format',