From 119eea6bdde919e9874f4a95841c8f9ad0c00799 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Sat, 30 Jul 2016 19:52:46 +0200
Subject: [PATCH] Backed out changeset 9966bbe6b534 (bug 1289976) for assertion
 failures in MediaDecoder.h

---
 dom/media/MediaDecoder.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 7b8b4b7eeed4..0b711718c737 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1862,9 +1862,8 @@ void
 MediaDecoder::ConstructMediaTracks()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(!IsShutdown());
 
-  if (mMediaTracksConstructed || !mInfo) {
+  if (IsShutdown() || mMediaTracksConstructed || !mInfo) {
     return;
   }