diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-03 09:06:25 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-03 09:06:25 +0100 |
| commit | 1626b5d7041ea9c3db92200f91542da46e49dde6 (patch) | |
| tree | e99c393052ef818645027da57774672990e29514 /config/external | |
| parent | 314fb761d144b160d3aeb72840c89e31c4f21a4a (diff) | |
| parent | 1d55939c7ca0e80555a24b240ff68d5bdbb48b4a (diff) | |
| download | UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar.gz UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar.lz UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.tar.xz UXP-1626b5d7041ea9c3db92200f91542da46e49dde6.zip | |
Merge branch 'master' into Basilisk-releasev2018.11.04
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 |