From 5080be29cfff8ad9b6c7545871ae8b6b1af14b64 Mon Sep 17 00:00:00 2001
From: Sotaro Ikeda <sikeda@mozilla.com>
Date: Wed, 19 Jun 2013 13:40:31 -0400
Subject: [PATCH] Bug 884440 - Remove item correctly from vector. r=doublec

---
 content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
index 13e13cb85775..c75ff19488ed 100644
--- a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
+++ b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
@@ -160,7 +160,7 @@ void MediaResourceManagerService::cancelClientLocked(const sp<IBinder>& binder)
   Fifo::iterator it(mVideoCodecRequestQueue.begin());
   while (it != mVideoCodecRequestQueue.end()) {
     if (*it == binder) {
-      *it = NULL;
+      it = mVideoCodecRequestQueue.erase(it);
       continue;
     }
     it++;
-- 
2.11.4.GIT