diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-10 16:59:13 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-10 16:59:13 +0100 |
| commit | 9697bfa68f32984b196748e388d743dddbe6aa7b (patch) | |
| tree | 3d8d23560d512199fbc8334bd15514d70ea00268 /dom/media/fmp4/MP4Stream.cpp | |
| parent | 7d398710beb67e03bf1690f73cdfd1ef2b76d31a (diff) | |
| parent | fbbda481dce5c367b4ccdeacc70cdcd7f68ac8af (diff) | |
| download | UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.gz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.lz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.tar.xz UXP-9697bfa68f32984b196748e388d743dddbe6aa7b.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'dom/media/fmp4/MP4Stream.cpp')
| -rw-r--r-- | dom/media/fmp4/MP4Stream.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/dom/media/fmp4/MP4Stream.cpp b/dom/media/fmp4/MP4Stream.cpp index 615a7dc01..9a79cac7a 100644 --- a/dom/media/fmp4/MP4Stream.cpp +++ b/dom/media/fmp4/MP4Stream.cpp @@ -48,9 +48,6 @@ MP4Stream::BlockingReadIntoCache(int64_t aOffset, size_t aCount, Monitor* aToUnl return true; } -// We surreptitiously reimplement the supposedly-blocking ReadAt as a non- -// blocking CachedReadAt, and record when it fails. This allows MP4Reader -// to retry the read as an actual blocking read without holding the lock. bool MP4Stream::ReadAt(int64_t aOffset, void* aBuffer, size_t aCount, size_t* aBytesRead) |