diff options
author | Steve Kondik <shade@chemlab.org> | 2014-05-06 03:22:11 -0700 |
---|---|---|
committer | Ethan Chen <intervigil@gmail.com> | 2014-11-25 08:01:18 +0000 |
commit | cd3a9ebb8ee5304d09fcf4b1bf75e815dd94568b (patch) | |
tree | e4c4b0a29372960311dae93c8983e87890ddd235 | |
parent | 6146bdb10e1d2e74b06f0906c5a7ffd7d3605fc2 (diff) | |
download | android_hardware_qcom_media-cd3a9ebb8ee5304d09fcf4b1bf75e815dd94568b.tar.gz android_hardware_qcom_media-cd3a9ebb8ee5304d09fcf4b1bf75e815dd94568b.tar.bz2 android_hardware_qcom_media-cd3a9ebb8ee5304d09fcf4b1bf75e815dd94568b.zip |
media: Avoid collision with FFMPEG plugin
Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
-rw-r--r-- | 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 f0806e5e..e58d1d71 100644 --- 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 @@ -74,6 +76,7 @@ enum { kKeyHSR = 'hsr ', // int32_t }; +#if 0 enum { kTypeDivXVer_3_11, kTypeDivXVer_4, @@ -85,6 +88,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 |