diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-05-06 03:22:11 -0700 |
|---|---|---|
| committer | Tony Layher <layhertony@gmail.com> | 2014-12-04 22:23:34 -0500 |
| commit | c3e8dbe73caff7ef8b50b4db53a866d70440ac68 (patch) | |
| tree | 41994bf4d9e244c5e8fc82a97b21474a014317ab | |
| parent | 644b6d7edbb687b835f7d982b6989ae7f5544bab (diff) | |
| download | android_hardware_qcom_media-stable/cm-12.1-caf-8084-YOG7D.tar.gz android_hardware_qcom_media-stable/cm-12.1-caf-8084-YOG7D.tar.bz2 android_hardware_qcom_media-stable/cm-12.1-caf-8084-YOG7D.zip | |
media: Avoid collision with FFMPEG pluginstable/cm-12.1-caf-8084-YOG7Dstable/cm-12.1-caf-8084-YOG4Pstable/cm-12.1-caf-8084-YOG3Cstable/cm-12.0-caf-8084-YNG4Nstable/cm-12.0-caf-8084-YNG3Cstable/cm-12.0-caf-8084-YNG1TAstable/cm-12.0-caf-8084-YNG1Tcm-12.1-caf-8084cm-12.0-caf-8084
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 c4805e00..4c0441b8 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 { kKeyMd5Sum = 'md5s', //cstring }; +#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 |