diff options
author | Lajos Molnar <lajos@google.com> | 2014-04-02 21:36:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-02 21:36:58 +0000 |
commit | 4cc0bedb859f9773f54f844cca4ce806c86bb6f8 (patch) | |
tree | 918f5f7b9a78a8f2fee4c6184c0fdec4ac40ccb5 /include | |
parent | 99021c47f45ee8bf3317cff7d08226e76c8d8227 (diff) | |
parent | 54b0bc74e051bd7df10cd657b481d88db6cdaa27 (diff) | |
download | frameworks_av-4cc0bedb859f9773f54f844cca4ce806c86bb6f8.zip frameworks_av-4cc0bedb859f9773f54f844cca4ce806c86bb6f8.tar.gz frameworks_av-4cc0bedb859f9773f54f844cca4ce806c86bb6f8.tar.bz2 |
Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"
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 863a7d5..8ec7f1c 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -189,6 +189,7 @@ private: bool mIsEncoder; bool mUseMetadataOnEncoderOutput; bool mShutdownInProgress; + bool mExplicitShutdown; // If "mKeepComponentAllocated" we only transition back to Loaded state // and do not release the component instance. |