summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrav90 <travawine@palemoon.org>2018-10-15 21:48:14 -0500
committertrav90 <travawine@palemoon.org>2018-10-15 21:48:14 -0500
commit99ed16064aed08591222a01ac0fdcebab3342dd8 (patch)
treebeec9a35b61f42513f4e33bc3d0b9ab8e36fd38b
parenta66e91651a81382ce117398303a220d75e8bc02e (diff)
downloadUXP-99ed16064aed08591222a01ac0fdcebab3342dd8.tar
UXP-99ed16064aed08591222a01ac0fdcebab3342dd8.tar.gz
UXP-99ed16064aed08591222a01ac0fdcebab3342dd8.tar.lz
UXP-99ed16064aed08591222a01ac0fdcebab3342dd8.tar.xz
UXP-99ed16064aed08591222a01ac0fdcebab3342dd8.zip
Add --enable-av1 configure switch
-rw-r--r--config/external/moz.build3
-rw-r--r--toolkit/moz.configure14
2 files changed, 17 insertions, 0 deletions
diff --git a/config/external/moz.build b/config/external/moz.build
index c52933db8..fbf6da089 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -33,6 +33,9 @@ if CONFIG['MOZ_WEBM_ENCODER']:
if not CONFIG['MOZ_SYSTEM_LIBVPX']:
external_dirs += ['media/libvpx']
+if CONFIG['MOZ_AV1']:
+ external_dirs += ['media/libaom']
+
if not CONFIG['MOZ_SYSTEM_PNG']:
external_dirs += ['media/libpng']
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 7d3065f53..792fb113d 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -358,6 +358,20 @@ 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',