diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-04 17:30:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-04 17:30:15 +0000 |
| commit | 050ff19e650a53fd2b6f1f2490758b4bf3104ca4 (patch) | |
| tree | 4ea0c0efea37bbf96c1bba355f82baf72f2db0ac /media | |
| parent | b0eb7b0a4c1c8f437d099eb14007863a94fcfbf0 (diff) | |
| parent | e6eea3a6b6e0cf92287ec1ceb8350f201d17e1ac (diff) | |
| download | frameworks_av-050ff19e650a53fd2b6f1f2490758b4bf3104ca4.zip frameworks_av-050ff19e650a53fd2b6f1f2490758b4bf3104ca4.tar.gz frameworks_av-050ff19e650a53fd2b6f1f2490758b4bf3104ca4.tar.bz2 | |
Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState"
Diffstat (limited to 'media')
| -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 4700c5f..e9d10cd 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -5325,6 +5325,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()); |