mozilla-inbound: changeset 255716:15ef1802114fd28a312362ef43a6bb50111e816c

author	Jan Gerber <j@mailb.org>
	Tue, 21 Jul 2015 12:54:50 +0200
changeset 255716	15ef1802114fd28a312362ef43a6bb50111e816c
parent 255715	37ce03221f95f5f147ae1daae7dbf604565bd702
child 255717	a4f7a655c74a5342146dd02aa042a8a1b8c16c6f
push id	63123
push user	jyavenard@mozilla.com
push date	Fri, 31 Jul 2015 22:35:45 +0000
treeherder	mozilla-inbound@15ef1802114f [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 5b54831761b1 / 42.0a1 / 20150804030204 / files nightly linux64 5b54831761b1 / 42.0a1 / 20150804030204 / files nightly mac 5b54831761b1 / 42.0a1 / 20150804030204 / files nightly win32 5b54831761b1 / 42.0a1 / 20150804030204 / files nightly win64 5b54831761b1 / 42.0a1 / 20150804030204 / files
last release without	nightly linux32 aeb85029c3b3 / 42.0a1 / 20150801030211 / files nightly linux64 aeb85029c3b3 / 42.0a1 / 20150801030211 / files nightly mac aeb85029c3b3 / 42.0a1 / 20150801030211 / files nightly win32 aeb85029c3b3 / 42.0a1 / 20150801030211 / files nightly win64 aeb85029c3b3 / 42.0a1 / 20150801030211 / files

--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -94,18 +94,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;