diff options
| author | Eric Laurent <elaurent@google.com> | 2013-12-20 17:26:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-20 17:26:47 -0800 |
| commit | b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d (patch) | |
| tree | 22e1841807882f29e91c14bc49815e4305337d0e /include | |
| parent | 5a086733f8a7472bee85b371e9d02874c9317f3b (diff) | |
| parent | 8115f4b206dbd04c620f062feb3c7785e2732ab3 (diff) | |
| download | frameworks_av-b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d.zip frameworks_av-b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d.tar.gz frameworks_av-b904d53ffaaafddb2f9b6f469b73d2a3bec3dd0d.tar.bz2 | |
am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '8115f4b206dbd04c620f062feb3c7785e2732ab3':
stagefright: do not offload LD-AAC decoding
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index de3fc36..3a87474 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -134,6 +134,7 @@ enum { kKeyRequiresSecureBuffers = 'secu', // bool (int32_t) kKeyIsADTS = 'adts', // bool (int32_t) + kKeyAACAOT = 'aaot', // int32_t // If a MediaBuffer's data represents (at least partially) encrypted // data, the following fields aid in decryption. |