diff options
| author | Han Wang <416810799@qq.com> | 2018-12-03 16:18:31 +0100 |
|---|---|---|
| committer | Han Wang <416810799@qq.com> | 2018-12-03 16:19:10 +0100 |
| commit | 6cda4de2075d703ad4be13d952ac3e52078f895b (patch) | |
| tree | 85f19038978a822e5cdd7b4df335c849efcae839 | |
| parent | 64f46f793320df8688f5a23567b53b78cfff5f7d (diff) | |
| download | android_hardware_qcom_media-lineage-16.0-caf-8994.tar.gz android_hardware_qcom_media-lineage-16.0-caf-8994.tar.bz2 android_hardware_qcom_media-lineage-16.0-caf-8994.zip | |
Revert "media: Avoid collision with FFMPEG plugin"lineage-16.0-caf-8994
* FFMPEG is no more.
This reverts commit d062bc0fbb44b668de3649e0d4ce3a7596f9aa37.
Change-Id: I5793f280eaaf379c467ce80cda1802bfd57911cc
| -rw-r--r-- | mm-core/inc/QCMetaData.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm-core/inc/QCMetaData.h b/mm-core/inc/QCMetaData.h index 232bcd71..11a664b9 100644 --- a/mm-core/inc/QCMetaData.h +++ b/mm-core/inc/QCMetaData.h @@ -36,7 +36,6 @@ 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 * @@ -48,7 +47,6 @@ enum { kKeyWMAFormatTag = 'fmtt', // int64_t kKeyWMABitspersample = 'bsps', // int64_t kKeyWMAVirPktSize = 'vpks', // int64_t -#endif kKeyWMAChannelMask = 'chmk', // int32_t kKeyVorbisData = 'vdat', // raw data @@ -78,7 +76,6 @@ enum { kKeyIsByteMode = 'bytm', //int32_t }; -#if 0 enum { kTypeDivXVer_3_11, kTypeDivXVer_4, @@ -90,7 +87,6 @@ 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 |