2023-12-18 19:28:57 +00:00
|
|
|
diff -up firefox-121.0/toolkit/content/jar.mn.disable-openh264-download firefox-121.0/toolkit/content/jar.mn
|
|
|
|
|
--- firefox-121.0/toolkit/content/jar.mn.disable-openh264-download 2023-12-18 20:15:04.352014249 +0100
|
|
|
|
|
+++ firefox-121.0/toolkit/content/jar.mn 2023-12-18 20:19:26.857929200 +0100
|
|
|
|
|
@@ -130,7 +130,6 @@ toolkit.jar:
|
|
|
|
|
#ifdef XP_MACOSX
|
|
|
|
|
content/global/macWindowMenu.js
|
|
|
|
|
#endif
|
|
|
|
|
- content/global/gmp-sources/openh264.json (gmp-sources/openh264.json)
|
|
|
|
|
content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
|
|
|
|
|
content/global/gmp-sources/widevinecdm_l1.json (gmp-sources/widevinecdm_l1.json)
|
|
|
|
|
|
|
|
|
|
diff -up firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs.disable-openh264-download firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs
|
|
|
|
|
--- firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs.disable-openh264-download 2023-12-11 21:42:21.000000000 +0100
|
|
|
|
|
+++ firefox-121.0/toolkit/modules/GMPInstallManager.sys.mjs 2023-12-18 20:18:52.665768579 +0100
|
|
|
|
|
@@ -35,11 +35,6 @@ function getScopedLogger(prefix) {
|
|
|
|
|
|
2020-09-25 09:54:11 +00:00
|
|
|
const LOCAL_GMP_SOURCES = [
|
|
|
|
|
{
|
|
|
|
|
- id: "gmp-gmpopenh264",
|
|
|
|
|
- src: "chrome://global/content/gmp-sources/openh264.json",
|
2023-12-18 19:28:57 +00:00
|
|
|
- installByDefault: true,
|
2020-09-25 09:54:11 +00:00
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
id: "gmp-widevinecdm",
|
|
|
|
|
src: "chrome://global/content/gmp-sources/widevinecdm.json",
|
2023-12-18 19:28:57 +00:00
|
|
|
installByDefault: true,
|
|
|
|
|
@@ -421,6 +416,9 @@ GMPInstallManager.prototype = {
|
2020-09-30 09:27:59 +00:00
|
|
|
* downloaderr, verifyerr or previouserrorencountered
|
|
|
|
|
*/
|
|
|
|
|
installAddon(gmpAddon) {
|
|
|
|
|
+ if (gmpAddon.isOpenH264) {
|
|
|
|
|
+ return Promise.reject({ type: "disabled" });
|
|
|
|
|
+ }
|
|
|
|
|
if (this._deferred) {
|
|
|
|
|
let log = getScopedLogger("GMPInstallManager.installAddon");
|
|
|
|
|
log.error("previous error encountered");
|
