diff options
author | Steve Kondik <shade@chemlab.org> | 2014-05-06 03:22:11 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-14 23:31:50 -0700 |
commit | d27e27c770bf7e6946e5e08833a3b59a0f2677fa (patch) | |
tree | c3c50d1248372667acc5c79065d27277dfdcfbea | |
parent | 65202023fdb0ded6e65d78cc185ac17d9fdae48e (diff) | |
download | android_hardware_qcom_media-stable/cm-12.1-YOG3C.tar.gz android_hardware_qcom_media-stable/cm-12.1-YOG3C.tar.bz2 android_hardware_qcom_media-stable/cm-12.1-YOG3C.zip |
media: Avoid collision with FFMPEG pluginstaging/cm-12.1stable/cm-12.1-YOG3C
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 |