diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-05-06 03:22:11 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-05-06 03:23:52 -0700 |
| commit | 2e082d6ab82b8d2fb377252a965f641886f69eb8 (patch) | |
| tree | 251b3b7dfc1341d962f19def4ecb38fd848c8bfe | |
| parent | 8476d1e4021972f522f910102374100be2f982dd (diff) | |
| download | android_hardware_qcom_media-2e082d6ab82b8d2fb377252a965f641886f69eb8.tar.gz android_hardware_qcom_media-2e082d6ab82b8d2fb377252a965f641886f69eb8.tar.bz2 android_hardware_qcom_media-2e082d6ab82b8d2fb377252a965f641886f69eb8.zip | |
media: Avoid collision with FFMPEG plugincm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea
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 6a2af1d3..432f2905 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 @@ -65,6 +67,7 @@ enum { kKeyHFR = 'hfr ', // int32_t }; +#if 0 enum { kTypeDivXVer_3_11, kTypeDivXVer_4, @@ -76,6 +79,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 |