summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-12-10 16:59:13 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-12-10 16:59:13 +0100
commit9697bfa68f32984b196748e388d743dddbe6aa7b (patch)
tree3d8d23560d512199fbc8334bd15514d70ea00268 /modules
parent7d398710beb67e03bf1690f73cdfd1ef2b76d31a (diff)
parentfbbda481dce5c367b4ccdeacc70cdcd7f68ac8af (diff)
downloadUXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar
UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.gz
UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.lz
UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.xz
UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.zip
Merge branch 'master' into Sync-weave
Diffstat (limited to 'modules')
-rw-r--r--modules/libpref/init/all.js3
1 files changed, 0 insertions, 3 deletions
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 546c836f0..a841bde55 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -362,9 +362,6 @@ pref("media.play-stand-alone", true);
pref("media.hardware-video-decoding.enabled", true);
pref("media.hardware-video-decoding.force-enabled", false);
-#ifdef MOZ_DIRECTSHOW
-pref("media.directshow.enabled", true);
-#endif
#ifdef MOZ_FMP4
pref("media.mp4.enabled", true);
// Specifies whether the PDMFactory can create a test decoder that