diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-23 01:43:12 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-23 01:43:12 +0200 |
| commit | dd33cb382321351aa3b960a6824cb9ec43bba05b (patch) | |
| tree | 729b4065b2a1c849d1fb6ad28b7e0c510f1a6a67 /dom/media/mediasource/TrackBuffersManager.cpp | |
| parent | 6a6e4bd25d61ecf21a28ea47f2a74927553fe959 (diff) | |
| parent | ab6242a93b849b0a3c7525b16bc01dd3172fc167 (diff) | |
| download | UXP-dd33cb382321351aa3b960a6824cb9ec43bba05b.tar UXP-dd33cb382321351aa3b960a6824cb9ec43bba05b.tar.gz UXP-dd33cb382321351aa3b960a6824cb9ec43bba05b.tar.lz UXP-dd33cb382321351aa3b960a6824cb9ec43bba05b.tar.xz UXP-dd33cb382321351aa3b960a6824cb9ec43bba05b.zip | |
Merge branch 'master' into Pale_Moon-release
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; |