diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-08-18 15:08:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 15:08:53 +0000 |
| commit | fecbc5da64a992f91f74ef6c67a7e247b0da7777 (patch) | |
| tree | 489211d95a97da04662d094e6df5872d5dd0ecb4 /include/media | |
| parent | cad46fbde4961d5374c27f9d85cd8f2b6822ffa7 (diff) | |
| parent | 5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423 (diff) | |
| download | frameworks_av-fecbc5da64a992f91f74ef6c67a7e247b0da7777.zip frameworks_av-fecbc5da64a992f91f74ef6c67a7e247b0da7777.tar.gz frameworks_av-fecbc5da64a992f91f74ef6c67a7e247b0da7777.tar.bz2 | |
am 5b4a5cce: Merge "do not dequeue from native window after we hit fatal error -- DO NOT MERGE" into lmp-dev
* commit '5b4a5cce6eb17ef5d0b37cfb4ad7e617eb978423':
do not dequeue from native window after we hit fatal error -- DO NOT MERGE
Diffstat (limited to 'include/media')
| -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 fcccc6d..a0e5d84 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -192,6 +192,7 @@ private: bool mSentFormat; bool mIsEncoder; bool mUseMetadataOnEncoderOutput; + bool mFatalError; bool mShutdownInProgress; bool mExplicitShutdown; |