diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-05-06 03:22:11 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2014-11-21 22:02:30 -0800 |
| commit | 443849aea9b41d830a524e07d88015c7913c8ae3 (patch) | |
| tree | 6bd350c21875f8e91c24c117f7881e5945eb8bb7 | |
| parent | 9ca8845c5e573fec36ca72203bcd27519dd252f1 (diff) | |
| download | android_hardware_qcom_media-stable/cm-12.0-YNG1TA.tar.gz android_hardware_qcom_media-stable/cm-12.0-YNG1TA.tar.bz2 android_hardware_qcom_media-stable/cm-12.0-YNG1TA.zip | |
media: Avoid collision with FFMPEG pluginstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0
Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
| -rwxr-xr-x | mm-core/inc/QCMetaData.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm-core/inc/QCMetaData.h b/mm-core/inc/QCMetaData.h index 473cca67..010f15ce 100755 --- a/mm-core/inc/QCMetaData.h +++ b/mm-core/inc/QCMetaData.h @@ -36,6 +36,7 @@ namespace android { enum { kKeyAacCodecSpecificData = 'nacc' , // for native aac files +#if 0 kKeyRawCodecSpecificData = 'rcsd', // raw data - added to support mmParser kKeyDivXVersion = 'DivX', // int32_t kKeyDivXDrm = 'QDrm', // void * @@ -47,6 +48,7 @@ enum { kKeyWMAFormatTag = 'fmtt', // int64_t kKeyWMABitspersample = 'bsps', // int64_t kKeyWMAVirPktSize = 'vpks', // int64_t +#endif kKeyWMAChannelMask = 'chmk', // int32_t kKeyFileFormat = 'ffmt', // cstring @@ -66,6 +68,7 @@ enum { kKeyHSR = 'hsr ', // int32_t }; +#if 0 enum { kTypeDivXVer_3_11, kTypeDivXVer_4, @@ -77,6 +80,7 @@ enum { kTypeWMAPro, kTypeWMALossLess, }; +#endif //This enum should be keep in sync with "enum Flags" in MediaExtractor.h in AOSP, //Value should reflect as last entry in the enum |