|
@@ -128,7 +128,7 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
|
|
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
--- a/toolkit/moz.configure
|
|
--- a/toolkit/moz.configure
|
|
+++ b/toolkit/moz.configure
|
|
+++ b/toolkit/moz.configure
|
|
-@@ -364,35 +364,27 @@ set_config('MOZ_FFMPEG', ffmpeg)
|
|
|
|
|
|
+@@ -364,35 +364,24 @@ set_config('MOZ_FFMPEG', ffmpeg)
|
|
set_define('MOZ_FFMPEG', ffmpeg)
|
|
set_define('MOZ_FFMPEG', ffmpeg)
|
|
imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
|
|
imply_option('--enable-fmp4', ffmpeg, '--enable-ffmpeg')
|
|
|
|
|
|
@@ -139,18 +139,17 @@ diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
|
|
|
|
|
-@depends('--enable-av1', target, c_compiler)
|
|
-@depends('--enable-av1', target, c_compiler)
|
|
-def av1(value, target, c_compiler):
|
|
-def av1(value, target, c_compiler):
|
|
-+@depends('--enable-av1', target, milestone)
|
|
|
|
-+def av1(value, target, milestone):
|
|
|
|
- enabled = bool(value)
|
|
|
|
|
|
+- enabled = bool(value)
|
|
- if value.origin == 'default':
|
|
- if value.origin == 'default':
|
|
- if target.os == 'WINNT' and target.cpu == 'x86' and \
|
|
- if target.os == 'WINNT' and target.cpu == 'x86' and \
|
|
- c_compiler and c_compiler.type == 'msvc':
|
|
- c_compiler and c_compiler.type == 'msvc':
|
|
- enabled = False
|
|
- enabled = False
|
|
- else:
|
|
- else:
|
|
- enabled = True
|
|
- enabled = True
|
|
-+ if value.origin == 'default' and milestone.is_nightly:
|
|
|
|
-+ enabled = target.os != 'Android'
|
|
|
|
- if enabled:
|
|
|
|
|
|
+- if enabled:
|
|
|
|
++@depends('--enable-av1')
|
|
|
|
++def av1(value):
|
|
|
|
++ if value:
|
|
return True
|
|
return True
|
|
|
|
|
|
@depends(target, nasm_version, when=av1 & compile_environment)
|
|
@depends(target, nasm_version, when=av1 & compile_environment)
|