summaryrefslogtreecommitdiffstats
path: root/dom/media/mediasource/MediaSource.cpp
diff options
context:
space:
mode:
authorJeroen Vreeken <jeroen@vreeken.net>2019-07-10 11:05:38 +0200
committerJeroen Vreeken <jeroen@vreeken.net>2019-07-10 11:08:09 +0200
commit18f9b185b67120ba88f5e643b7413ca06c497383 (patch)
treee07ea39a12a7d6b1e0b7c88cdaf2764ae2ba6836 /dom/media/mediasource/MediaSource.cpp
parentdd924323c3cda022493cd78d42da190577be20cf (diff)
downloadUXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.gz
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.lz
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.tar.xz
UXP-18f9b185b67120ba88f5e643b7413ca06c497383.zip
Allow matroska mime types for video element and MSE
Allow avc (h.264) content in matroska/webm containers
Diffstat (limited to 'dom/media/mediasource/MediaSource.cpp')
-rw-r--r--dom/media/mediasource/MediaSource.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp
index 152c0085a..a262ff52c 100644
--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -110,7 +110,8 @@ MediaSource::IsTypeSupported(const nsAString& aType, DecoderDoctorDiagnostics* a
}
return NS_OK;
}
- if (mimeType.EqualsASCII("video/webm")) {
+ if (mimeType.EqualsASCII("video/webm") ||
+ mimeType.EqualsASCII("video/x-matroska")) {
if (!(Preferences::GetBool("media.mediasource.webm.enabled", false) ||
IsWebMForced(aDiagnostics))) {
return NS_ERROR_DOM_NOT_SUPPORTED_ERR;