summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-10-13 18:51:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-13 18:51:14 +0000
commit319898b799cb0c2c58174c8d5702a22f822421eb (patch)
treeb5a1d67b83d17bd8457a82a99c1ffb65eada80e8 /media/libstagefright
parent935c97aa76b2b6f2e44695a478d700b37268ce4f (diff)
parent7225187b5126b921e40f0221db158a16c366344e (diff)
downloadframeworks_av-319898b799cb0c2c58174c8d5702a22f822421eb.zip
frameworks_av-319898b799cb0c2c58174c8d5702a22f822421eb.tar.gz
frameworks_av-319898b799cb0c2c58174c8d5702a22f822421eb.tar.bz2
am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev
* commit '7225187b5126b921e40f0221db158a16c366344e': ACodec: process deferred messages when entering Loaded state.
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/ACodec.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index e5c16ea..4a4f4db 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -4578,6 +4578,8 @@ void ACodec::LoadedState::stateEntered() {
onShutdown(keepComponentAllocated);
}
mCodec->mExplicitShutdown = false;
+
+ mCodec->processDeferredMessages();
}
void ACodec::LoadedState::onShutdown(bool keepComponentAllocated) {