diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-04 20:44:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 20:44:16 +0000 |
| commit | 3e715975a59f83084355ef600106d615a4f7f13f (patch) | |
| tree | 5f3326e7b307a8699cd9c22bbb77a6afc592f902 /media/libstagefright | |
| parent | 73cdb2fd391a8f7f939f8a9104a8ae2b2838bae5 (diff) | |
| parent | 105860cea2956f31f1c64d7a83a4a3bb21789cb8 (diff) | |
| download | frameworks_av-3e715975a59f83084355ef600106d615a4f7f13f.zip frameworks_av-3e715975a59f83084355ef600106d615a4f7f13f.tar.gz frameworks_av-3e715975a59f83084355ef600106d615a4f7f13f.tar.bz2 | |
am 105860ce: am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState"
* commit '105860cea2956f31f1c64d7a83a4a3bb21789cb8':
libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 20aebc5..7dfd8d6 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -5371,6 +5371,7 @@ bool ACodec::OutputPortSettingsChangedState::onMessageReceived( case kWhatFlush: case kWhatShutdown: case kWhatResume: + case kWhatSetParameters: { if (msg->what() == kWhatResume) { ALOGV("[%s] Deferring resume", mCodec->mComponentName.c_str()); |