summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-10-13 19:11:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-13 19:11:24 +0000
commita15b34244cb9d4e65ed4fede11c9fb83b7fb46c5 (patch)
treef42aeca5addc0c4609715aa00ae44ccdebcc13c5 /media/libstagefright/ACodec.cpp
parent0ed9ef31c302ebe081589f8e8603832f79c664a8 (diff)
parent7d2b381f6a611e60f715e8356269c71ecc7f5884 (diff)
downloadframeworks_av-a15b34244cb9d4e65ed4fede11c9fb83b7fb46c5.zip
frameworks_av-a15b34244cb9d4e65ed4fede11c9fb83b7fb46c5.tar.gz
frameworks_av-a15b34244cb9d4e65ed4fede11c9fb83b7fb46c5.tar.bz2
am 7d2b381f: am e39c1929: am 7225187b: Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev
* commit '7d2b381f6a611e60f715e8356269c71ecc7f5884': ACodec: process deferred messages when entering Loaded state.
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-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) {