summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-10-13 18:57:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-13 18:57:59 +0000
commit7d2b381f6a611e60f715e8356269c71ecc7f5884 (patch)
tree97c44b6b0e050500f9ae4dde2810fbf7a015f08e /media/libstagefright
parent0f69763d41c101a2afcac7f10be86b41974f1279 (diff)
parente39c192937df50861067b376c7ea8a58cdc68205 (diff)
downloadframeworks_av-7d2b381f6a611e60f715e8356269c71ecc7f5884.zip
frameworks_av-7d2b381f6a611e60f715e8356269c71ecc7f5884.tar.gz
frameworks_av-7d2b381f6a611e60f715e8356269c71ecc7f5884.tar.bz2
am e39c1929: am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev
* commit 'e39c192937df50861067b376c7ea8a58cdc68205': 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 b693625..b8d5c7b 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) {