diff options
author | Gloria Wang <gwang@google.com> | 2010-10-25 15:23:04 -0700 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:11:18 -0700 |
commit | a9741a9232c81eaf59179acef91f5be46c42264e (patch) | |
tree | 9a66416b42a28ec2ad4fa2ec520c42d976046aec /include/media/stagefright/MetaData.h | |
parent | d8cba5371423841e6a85816ad4a7fd88d3a60b12 (diff) | |
parent | dcd25efb46c41c8d24a0a9cf61fb57f84149709e (diff) | |
download | frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.zip frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.gz frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.bz2 |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
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 d2bd9f2..ac0624a 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 |