diff options
| author | Chong Zhang <chz@google.com> | 2015-08-15 01:01:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-15 01:01:09 +0000 |
| commit | 4883125b0df72ee404de8b244c3e6511f62947ee (patch) | |
| tree | 358b8cb0622b927674b413e0e07b7da6dd452e21 /include | |
| parent | bad4358c83c7daaf9eeb8542c15eea4f473c884c (diff) | |
| parent | a89cfb6cab17700efa62665cda3bc4b87c6f1ad8 (diff) | |
| download | frameworks_av-4883125b0df72ee404de8b244c3e6511f62947ee.zip frameworks_av-4883125b0df72ee404de8b244c3e6511f62947ee.tar.gz frameworks_av-4883125b0df72ee404de8b244c3e6511f62947ee.tar.bz2 | |
Merge "do not dequeue from native window after we hit fatal error" into mnc-dev
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 05f6786..8b5b862 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -236,6 +236,7 @@ private: bool mSentFormat; bool mIsVideo; bool mIsEncoder; + bool mFatalError; bool mShutdownInProgress; bool mExplicitShutdown; |