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/TrackBuffersManager.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/TrackBuffersManager.cpp')
| -rw-r--r-- | dom/media/mediasource/TrackBuffersManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dom/media/mediasource/TrackBuffersManager.cpp b/dom/media/mediasource/TrackBuffersManager.cpp index ac6d82411..21fb158b5 100644 --- a/dom/media/mediasource/TrackBuffersManager.cpp +++ b/dom/media/mediasource/TrackBuffersManager.cpp @@ -814,6 +814,8 @@ TrackBuffersManager::CreateDemuxerforMIMEType() ShutdownDemuxers(); if (mType.LowerCaseEqualsLiteral("video/webm") || + mType.LowerCaseEqualsLiteral("video/x-matroska") || + mType.LowerCaseEqualsLiteral("audio/x-matroska") || mType.LowerCaseEqualsLiteral("audio/webm")) { mInputDemuxer = new WebMDemuxer(mCurrentInputBuffer, true /* IsMediaSource*/ ); return; |