diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-08-18 15:19:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 15:19:20 +0000 |
| commit | 8910f92aea5791f245da2c69a8c2ad3fb92bb310 (patch) | |
| tree | b12bf3da1c3457982ccff6c6d4aeb24d90ffb639 /include | |
| parent | a2c49ff4e71d33e76fcbc57526a2141a623efc56 (diff) | |
| parent | 2ea335b11c1e328896a6c7a2e6d2bc190b7f06fc (diff) | |
| download | frameworks_av-8910f92aea5791f245da2c69a8c2ad3fb92bb310.zip frameworks_av-8910f92aea5791f245da2c69a8c2ad3fb92bb310.tar.gz frameworks_av-8910f92aea5791f245da2c69a8c2ad3fb92bb310.tar.bz2 | |
am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
* commit '2ea335b11c1e328896a6c7a2e6d2bc190b7f06fc':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 595ace8..29c9002 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -194,6 +194,7 @@ private: bool mSentFormat; bool mIsEncoder; bool mUseMetadataOnEncoderOutput; + bool mFatalError; bool mShutdownInProgress; bool mExplicitShutdown; |