From 9f1b1ecd84e453aa3c4f64e51aac6e40587fd6ea Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Fri, 27 Feb 2015 11:47:12 +1300
Subject: [PATCH] Bug 1136984 - Always call DrainComplete in response to Drain,
 even if it wasn't called on the active decoder. r=cpearce

---
 dom/media/fmp4/SharedDecoderManager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dom/media/fmp4/SharedDecoderManager.cpp b/dom/media/fmp4/SharedDecoderManager.cpp
index b01e5cc5274e..27e9aa92212f 100644
--- a/dom/media/fmp4/SharedDecoderManager.cpp
+++ b/dom/media/fmp4/SharedDecoderManager.cpp
@@ -196,8 +196,10 @@ SharedDecoderProxy::Drain()
 {
   if (mManager->mActiveProxy == this) {
     return mManager->mDecoder->Drain();
+  } else {
+    mCallback->DrainComplete();
+    return NS_OK;
   }
-  return NS_OK;
 }
 
 nsresult