From a317822b091330c788e0f41562285baa4e9bde96 Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Fri, 24 Jul 2015 17:33:43 -0700
Subject: [PATCH] Bug 1171379: P1. Enable MediaSourceDemuxer by default.
 r=kentuckyfriedtakahe a=bustage

--HG--
extra : amend_source : 061f66a713c0f83f9fe67f096b6567a4a3ecba9b
extra : histedit_source : a1bb7032b07d024c6b8ecb943a0509035fb3b9be%2C52924f5f97706c42b0b1d3d304a90b35847ce729
---
 modules/libpref/init/all.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index 8e8a9dbcc0c1..d71dd9324a09 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -471,8 +471,12 @@ pref("media.mediasource.whitelist", false);
 pref("media.mediasource.mp4.enabled", true);
 pref("media.mediasource.webm.enabled", false);
 
-// Enable new MediaSource architecture.
+#if defined(MOZ_WIDGET_GONK)
 pref("media.mediasource.format-reader", false);
+#else
+// Enable new MediaSource architecture.
+pref("media.mediasource.format-reader", true);
+#endif
 
 // Enable new MediaFormatReader architecture for webm in MSE
 pref("media.mediasource.format-reader.webm", false);