diff options
| author | Han Wang <416810799@qq.com> | 2018-12-03 16:18:31 +0100 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2018-12-03 23:03:43 +0000 |
| commit | cc77d9abbe4b0fdbe1561b2acfce8754db1ed444 (patch) | |
| tree | e25ea264d8a49d1d4acc3e30fa85b3f18d57a7b4 | |
| parent | 80679512fc62e9ae88d06040e77d10df0bc64056 (diff) | |
| download | android_hardware_qcom_media-lineage-16.0-caf-8974.tar.gz android_hardware_qcom_media-lineage-16.0-caf-8974.tar.bz2 android_hardware_qcom_media-lineage-16.0-caf-8974.zip | |
Revert "media: Avoid collision with FFMPEG plugin"lineage-16.0-caf-8974
* FFMPEG is no more.
This reverts commit 4ab165431cdc8946c529523b1390a12c8e88350a.
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 ee95ca42..02188fb2 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 |