mozilla-central: changeset 357204:f0e461394f7e1ebce5c902fe42ef1e7269c64b76

author	Jean-Yves Avenard <jyavenard@mozilla.com>
	Tue, 25 Apr 2017 15:28:31 +0200
changeset 357204	f0e461394f7e1ebce5c902fe42ef1e7269c64b76
parent 357203	c528edf75b2e506246c21602505164032fd69ebd
child 357205	23327af4c4c70b3d096029721414b2ba7ad9a0c7
push id	31788
push user	kwierso@gmail.com
push date	Tue, 09 May 2017 20:48:49 +0000
treeherder	mozilla-central@2b6f6881a24a [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jwwang
bugs	1357040
milestone	55.0a1
first release with	nightly linux32 ce2218406119 / 55.0a1 / 20170510183715 / files nightly linux64 ce2218406119 / 55.0a1 / 20170510183715 / files nightly mac 120d8562d4a5 / 55.0a1 / 20170510030301 / files nightly win32 120d8562d4a5 / 55.0a1 / 20170510030301 / files nightly win64 120d8562d4a5 / 55.0a1 / 20170510030301 / files
last release without	nightly linux32 b21b974d60d3 / 55.0a1 / 20170509100208 / files nightly linux64 b21b974d60d3 / 55.0a1 / 20170509100208 / files nightly mac b21b974d60d3 / 55.0a1 / 20170509030205 / files nightly win32 b21b974d60d3 / 55.0a1 / 20170509030205 / files nightly win64 b21b974d60d3 / 55.0a1 / 20170509030205 / files

--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -2893,19 +2893,17 @@ MediaFormatReader::NotifyTrackDemuxers()
   }
 }
 
 void
 MediaFormatReader::NotifyDataArrived()
 {
   MOZ_ASSERT(OnTaskQueue());
 
-  if (mShutdown
-      || !mDemuxer
-      || (!mDemuxerInitDone && !mDemuxerInitRequest.Exists())) {
+  if (mShutdown || !mDemuxer || !mDemuxerInitDone) {
     return;
   }
 
   if (mNotifyDataArrivedPromise.Exists()) {
     // Already one in progress. Set the dirty flag so we can process it later.
     mPendingNotifyDataArrived = true;
     return;
   }