|
@@ -20,7 +20,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D2362
|
|
|
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
|
--- a/toolkit/moz.configure
|
|
|
+++ b/toolkit/moz.configure
|
|
|
-@@ -364,21 +364,23 @@ set_config('MOZ_FFMPEG', ffmpeg)
|
|
|
+@@ -388,23 +388,23 @@ set_config('MOZ_FFMPEG', ffmpeg)
|
|
|
set_define('MOZ_FFMPEG', ffmpeg)
|
|
|
imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
|
|
|
|
|
@@ -34,12 +34,12 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
|
+@depends('--enable-av1', target)
|
|
|
+def av1(value, target):
|
|
|
enabled = bool(value)
|
|
|
-- if value.origin == 'default' and milestone.is_nightly:
|
|
|
-- enabled = target.os != 'Android'
|
|
|
-+ if target.os == 'WINNT' and target.cpu == 'x86':
|
|
|
-+ enabled = False
|
|
|
+ if value.origin == 'default':
|
|
|
+ if target.os == 'WINNT' and target.cpu == 'x86':
|
|
|
+ enabled = False
|
|
|
+- elif milestone.is_nightly:
|
|
|
+ else:
|
|
|
-+ enabled = target.os != 'Android'
|
|
|
+ enabled = target.os != 'Android'
|
|
|
if enabled:
|
|
|
return True
|
|
|
|
|
@@ -47,4 +47,4 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
|
set_define('MOZ_AV1', av1)
|
|
|
|
|
|
# Built-in fragmented MP4 support.
|
|
|
- # ==============================================================
|
|
|
+
|