summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJon Larimer <jlarimer@google.com>2015-08-20 01:16:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 01:16:06 +0000
commit02a65c4f599035bf6d58ceda766311f8cb188ba3 (patch)
treeee6b8c9a55375e1585a567ac94ba579007f1d49d /include
parent612cf86e53f48cd347cf9b5a87e1d91d3d1dc601 (diff)
parent8910f92aea5791f245da2c69a8c2ad3fb92bb310 (diff)
downloadframeworks_av-02a65c4f599035bf6d58ceda766311f8cb188ba3.zip
frameworks_av-02a65c4f599035bf6d58ceda766311f8cb188ba3.tar.gz
frameworks_av-02a65c4f599035bf6d58ceda766311f8cb188ba3.tar.bz2
am 8910f92a: 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 '8910f92aea5791f245da2c69a8c2ad3fb92bb310': 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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index cd2bd27..7825508 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;