diff options
| author | Gloria Wang <gwang@google.com> | 2010-10-25 16:56:49 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:56:49 -0700 |
| commit | aceaaf303422bbe3a7b8d9cdb96495dbf8109c23 (patch) | |
| tree | 567006154374135f6747dd8a81288d3b5570c11f /include/media/stagefright/MetaData.h | |
| parent | 4cd5c79858d5c8508dffdcba5a0fcb941a39cbef (diff) | |
| parent | a9741a9232c81eaf59179acef91f5be46c42264e (diff) | |
| download | frameworks_av-aceaaf303422bbe3a7b8d9cdb96495dbf8109c23.zip frameworks_av-aceaaf303422bbe3a7b8d9cdb96495dbf8109c23.tar.gz frameworks_av-aceaaf303422bbe3a7b8d9cdb96495dbf8109c23.tar.bz2 | |
resolved conflicts for merge of 965f960e to master
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
Diffstat (limited to 'include/media/stagefright/MetaData.h')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 423f385..a72aabf 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -57,6 +57,8 @@ enum { kKeyBufferID = 'bfID', kKeyMaxInputSize = 'inpS', kKeyThumbnailTime = 'thbT', // int64_t (usecs) + kKeyTrackID = 'trID', + kKeyIsDRM = 'idrm', // int32_t (bool) kKeyAlbum = 'albu', // cstring kKeyArtist = 'arti', // cstring |