wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to inbound.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-07-12 22:32:46 -04:00
commit 416262f62f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "93d613b62a4697824f918b3625da100d2e177eaa",
"revision": "9a9c7a559a26cc11669de92c05e36d6e9e81fe6d",
"repo_path": "/integration/gaia-central"
}

4
content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp
View File

@ -159,7 +159,7 @@ void MediaResourceManagerService::cancelClientLocked(const sp<IBinder>& binder)
// Clear the request from request queue.
Fifo::iterator it(mVideoCodecRequestQueue.begin());
while (it != mVideoCodecRequestQueue.end()) {
if (*it == binder) {
if ((*it).get() == binder.get()) {
it = mVideoCodecRequestQueue.erase(it);
continue;
}
@ -168,7 +168,7 @@ void MediaResourceManagerService::cancelClientLocked(const sp<IBinder>& binder)
// Clear the client from the resource
for (int i=0 ; i<mVideoDecoderCount ; i++) {
if (mVideoDecoderSlots[i].mClient == binder) {
if (mVideoDecoderSlots[i].mClient.get() == binder.get()) {
mVideoDecoderSlots[i].mClient = NULL;
}
}