diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-22 21:27:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 21:27:04 +0000 |
| commit | ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10 (patch) | |
| tree | eb31f55de1279c9bbfa88c230b31677ecab4930e /include | |
| parent | a968c6e34d028ac81a7997685c3ebfd576ae192e (diff) | |
| parent | ffe398116e5049e80ac818dbc621f06fe0196038 (diff) | |
| download | frameworks_av-ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10.zip frameworks_av-ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10.tar.gz frameworks_av-ccaf667eb6e96a28caedb0d4f776b1ff9c4aed10.tar.bz2 | |
am ffe39811: am 8274b049: am cd3fc4e3: am 6ce19d24: Merge "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-dev
* commit 'ffe398116e5049e80ac818dbc621f06fe0196038':
Stagefright: MediaCodec: shutdown allocated codec on error
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index bca78b9..54a4e8b 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -205,6 +205,7 @@ private: kFlagIsEncoder = 256, kFlagGatherCodecSpecificData = 512, kFlagIsAsync = 1024, + kFlagIsComponentAllocated = 2048, }; struct BufferInfo { |