Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-11-22 10:59:44 +08:00
commit 01a4bc1e3b
21 changed files with 4132 additions and 3879 deletions

View file

@ -49,7 +49,6 @@ const GMP_PLUGINS = [
homepageURL: "http://www.openh264.org/",
optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul"
},
/*
{
id: EME_ADOBE_ID,
name: "eme-adobe_name",
@ -59,12 +58,11 @@ const GMP_PLUGINS = [
optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul",
isEME: true
},
*/
{
id: WIDEVINE_ID,
name: "widevine_description",
name: "widevine_name",
// Describe the purpose of both CDMs in the same way.
description: "eme-adobe_description",
description: "widevine_description2",
licenseURL: "https://www.google.com/policies/privacy/",
homepageURL: "https://www.widevine.com/",
optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul",