diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-07-11 14:56:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 14:56:41 +0000 |
| commit | 04a7c6bb4e4048369e0a635dc02e9d83bbd59f87 (patch) | |
| tree | cd580c19b66ce62987ece8df5d2ba7384c329502 /dom/media/mediasource/ContainerParser.cpp | |
| parent | dd924323c3cda022493cd78d42da190577be20cf (diff) | |
| parent | 31addeaac8841867008699478ef55e1c1b3d68a7 (diff) | |
| download | UXP-04a7c6bb4e4048369e0a635dc02e9d83bbd59f87.tar UXP-04a7c6bb4e4048369e0a635dc02e9d83bbd59f87.tar.gz UXP-04a7c6bb4e4048369e0a635dc02e9d83bbd59f87.tar.lz UXP-04a7c6bb4e4048369e0a635dc02e9d83bbd59f87.tar.xz UXP-04a7c6bb4e4048369e0a635dc02e9d83bbd59f87.zip | |
Merge pull request #1174 from JeroenVreeken/master
Report matroska containers as supported and also support h.264 content in a matroska container file
Diffstat (limited to 'dom/media/mediasource/ContainerParser.cpp')
| -rw-r--r-- | dom/media/mediasource/ContainerParser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/dom/media/mediasource/ContainerParser.cpp b/dom/media/mediasource/ContainerParser.cpp index 4ae37d7e9..b4dcfde8a 100644 --- a/dom/media/mediasource/ContainerParser.cpp +++ b/dom/media/mediasource/ContainerParser.cpp @@ -697,6 +697,9 @@ ContainerParser::CreateForMIMEType(const nsACString& aType) if (aType.LowerCaseEqualsLiteral("video/webm") || aType.LowerCaseEqualsLiteral("audio/webm")) { return new WebMContainerParser(aType); } + if (aType.LowerCaseEqualsLiteral("video/x-matroska") || aType.LowerCaseEqualsLiteral("audio/x-matroska")) { + return new WebMContainerParser(aType); + } #ifdef MOZ_FMP4 if (aType.LowerCaseEqualsLiteral("video/mp4") || aType.LowerCaseEqualsLiteral("audio/mp4")) { |