diff options
| author | Eric Laurent <elaurent@google.com> | 2013-12-21 01:37:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-21 01:37:03 +0000 |
| commit | e6144d7a558c74e508a5c103cdc462c3cd7cf508 (patch) | |
| tree | 33c25fba8c56455027abbc775361f9e2864b9a97 /include | |
| parent | 864866a6530c37f2f138d78343dc03bf0d2ef9b4 (diff) | |
| parent | 42d89e5de5f401c7e81e1961061d07ae490c9d29 (diff) | |
| download | frameworks_av-e6144d7a558c74e508a5c103cdc462c3cd7cf508.zip frameworks_av-e6144d7a558c74e508a5c103cdc462c3cd7cf508.tar.gz frameworks_av-e6144d7a558c74e508a5c103cdc462c3cd7cf508.tar.bz2 | |
am 42d89e5d: am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"
* commit '42d89e5de5f401c7e81e1961061d07ae490c9d29':
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. |