diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-07 12:47:12 +0100 |
| commit | 8240fb9c736f91044cabbdde8c537b179fc4921e (patch) | |
| tree | 49a4cc8dc683cf955d61b6618ad471860554ccb5 /config/external | |
| parent | f9e04b54c2ccbc1f8e24b511003de09b4565193c (diff) | |
| parent | 5c83a18cde404b5c0c9fba1d35f003d951ea32e2 (diff) | |
| download | UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.gz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.lz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.tar.xz UXP-8240fb9c736f91044cabbdde8c537b179fc4921e.zip | |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
Diffstat (limited to 'config/external')
| -rw-r--r-- | config/external/moz.build | 3 | ||||
| -rw-r--r-- | config/external/nss/nss.symbols | 1 |
2 files changed, 3 insertions, 1 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/config/external/nss/nss.symbols b/config/external/nss/nss.symbols index 3239d3119..7a968b6c8 100644 --- a/config/external/nss/nss.symbols +++ b/config/external/nss/nss.symbols @@ -165,7 +165,6 @@ DER_GeneralizedTimeToTime DER_GeneralizedTimeToTime_Util DER_GetInteger DER_GetInteger_Util -DER_Lengths DER_SetUInteger DER_UTCTimeToTime_Util DSAU_DecodeDerSigToLen |