mozilla-inbound: changeset 291876:a2fbcf1728cada53e5cb7c8e14537ba4b36461b0

author	Jean-Yves Avenard <jyavenard@mozilla.com>
	Wed, 06 Apr 2016 21:26:46 +1000
changeset 291876	a2fbcf1728cada53e5cb7c8e14537ba4b36461b0
parent 291875	38204fd2ece962c9504ae59d58c99bf38b5626bd
child 291877	f33a85c0997b0497f305f9e16bd1e6002746ab49
push id	74704
push user	jyavenard@mozilla.com
push date	Wed, 06 Apr 2016 11:30:32 +0000
treeherder	mozilla-inbound@a2fbcf1728ca [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gerald
bugs	1262396
milestone	48.0a1
first release with	nightly linux32 b6683e141c47 / 48.0a1 / 20160407030234 / files nightly linux64 b6683e141c47 / 48.0a1 / 20160407030234 / files nightly mac b6683e141c47 / 48.0a1 / 20160407030234 / files nightly win32 b6683e141c47 / 48.0a1 / 20160407030234 / files nightly win64 b6683e141c47 / 48.0a1 / 20160407030234 / files
last release without	nightly linux32 68c0b7d6f16c / 48.0a1 / 20160406030221 / files nightly linux64 68c0b7d6f16c / 48.0a1 / 20160406030221 / files nightly mac 68c0b7d6f16c / 48.0a1 / 20160406030221 / files nightly win32 68c0b7d6f16c / 48.0a1 / 20160406030221 / files nightly win64 68c0b7d6f16c / 48.0a1 / 20160406030221 / files

--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -775,17 +775,16 @@ void
 TrackBuffersManager::RejectAppend(nsresult aRejectValue, const char* aName)
 {
   MSE_DEBUG("rv=%d", aRejectValue);
   if (mDetached) {
     // We've been detached.
     return;
   }
   MOZ_DIAGNOSTIC_ASSERT(mCurrentTask && mCurrentTask->GetType() == SourceBufferTask::Type::AppendBuffer);
-  MOZ_DIAGNOSTIC_ASSERT(mSourceBufferAttributes);
 
   mCurrentTask->As<AppendBufferTask>()->mPromise.Reject(aRejectValue, __func__);
   mSourceBufferAttributes = nullptr;
   mCurrentTask = nullptr;
   ProcessTasks();
 }
 
 void