diff options
author | Isaac David <isacdaavid@isacdaavid.info> | 2016-01-12 11:05:39 -0600 |
---|---|---|
committer | Isaac David <isacdaavid@isacdaavid.info> | 2016-01-12 11:05:39 -0600 |
commit | baf24e9cd6c93bd843f7513af3ed8b7eabc06eb4 (patch) | |
tree | 7911ef931ba007736ef612902721b7ac8d82b005 /libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch | |
parent | cbe7bf33959c63315ecb41c164240bd9df5316f2 (diff) | |
download | abslibre-baf24e9cd6c93bd843f7513af3ed8b7eabc06eb4.tar.gz abslibre-baf24e9cd6c93bd843f7513af3ed8b7eabc06eb4.tar.bz2 abslibre-baf24e9cd6c93bd843f7513af3ed8b7eabc06eb4.zip |
libre-testing/iceweasel: updating version
Diffstat (limited to 'libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch')
-rw-r--r-- | libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch b/libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch new file mode 100644 index 000000000..25f7ed5d4 --- /dev/null +++ b/libre-testing/iceweasel/iceweasel-disable-GMP-PDM.patch @@ -0,0 +1,34 @@ +# HG changeset patch +# User Jean-Yves Avenard <jyavenard@mozilla.com> + +Bug 1233429: Disable GMP PDM. r=cpearce + +Prevent users from shooting themselves in the foot by turning some prefs on. + +diff --git a/dom/media/platforms/PlatformDecoderModule.cpp b/dom/media/platforms/PlatformDecoderModule.cpp +index 530c7b9..50933ca 100644 +--- a/dom/media/platforms/PlatformDecoderModule.cpp ++++ b/dom/media/platforms/PlatformDecoderModule.cpp +@@ -150,20 +150,22 @@ PlatformDecoderModule::Create() + } + return CreateAgnosticDecoderModule(); + } + + /* static */ + already_AddRefed<PlatformDecoderModule> + PlatformDecoderModule::CreatePDM() + { ++#ifndef RELEASE_BUILD + if (sGMPDecoderEnabled) { + nsRefPtr<PlatformDecoderModule> m(new GMPDecoderModule()); + return m.forget(); + } ++#endif + #ifdef MOZ_WIDGET_ANDROID + if(sAndroidMCDecoderPreferred && sAndroidMCDecoderEnabled){ + nsRefPtr<PlatformDecoderModule> m(new AndroidDecoderModule()); + return m.forget(); + } + #endif + if (sUseBlankDecoder) { + return CreateBlankDecoderModule(); |