mozilla-inbound: changeset 255376:b9cc2c3f8bda29fbc48f9772dd9c7fef2f634280

author	Jan Gerber <j@mailb.org>
	Tue, 21 Jul 2015 12:54:50 +0200
changeset 255376	b9cc2c3f8bda29fbc48f9772dd9c7fef2f634280
parent 255375	8b17cd28311083d110b5d2d5da5401295d3f9e32
child 255377	1199933ae78ca2294d7e19015d566b23bc8e52b2
push id	63016
push user	jyavenard@mozilla.com
push date	Thu, 30 Jul 2015 06:57:54 +0000
treeherder	mozilla-inbound@b9cc2c3f8bda [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jya
bugs	1187247
milestone	42.0a1
first release with	nightly linux32 ca53d4297f02 / 42.0a1 / 20150731030206 / files nightly linux64 ca53d4297f02 / 42.0a1 / 20150731030206 / files nightly mac ca53d4297f02 / 42.0a1 / 20150731030206 / files nightly win32 ca53d4297f02 / 42.0a1 / 20150731030206 / files nightly win64 ca53d4297f02 / 42.0a1 / 20150731030206 / files
last release without	nightly linux32 62469b20ec84 / 42.0a1 / 20150730030208 / files nightly linux64 62469b20ec84 / 42.0a1 / 20150730030208 / files nightly mac 62469b20ec84 / 42.0a1 / 20150730030208 / files nightly win32 62469b20ec84 / 42.0a1 / 20150730030208 / files nightly win64 62469b20ec84 / 42.0a1 / 20150730030208 / files

--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -98,18 +98,17 @@ IsTypeSupported(const nsAString& aType)
         }
         if (hasCodecs &&
             DecoderTraits::CanHandleCodecsType(mimeTypeUTF8.get(),
                                                codecs) == CANPLAY_NO) {
           return NS_ERROR_DOM_INVALID_STATE_ERR;
         }
         return NS_OK;
       } else if (DecoderTraits::IsWebMType(mimeTypeUTF8)) {
-        if (!Preferences::GetBool("media.mediasource.webm.enabled", false) ||
-            Preferences::GetBool("media.mediasource.format-reader", false)) {
+        if (!Preferences::GetBool("media.mediasource.webm.enabled", false)) {
           return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
         }
         if (hasCodecs &&
             DecoderTraits::CanHandleCodecsType(mimeTypeUTF8.get(),
                                                codecs) == CANPLAY_NO) {
           return NS_ERROR_DOM_INVALID_STATE_ERR;
         }
         return NS_OK;