From 0e94962e3af8b1dd75c1f4dbb88590c737d7e6d9 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Tue, 6 May 2014 03:22:11 -0700
Subject: media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
---
 mm-core/inc/QCMetaData.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm-core/inc/QCMetaData.h b/mm-core/inc/QCMetaData.h
index 02188fb2..ee95ca42 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
     kKeyVorbisData           = 'vdat',  // raw data
 
@@ -76,6 +78,7 @@ enum {
     kKeyIsByteMode        = 'bytm', //int32_t
 };
 
+#if 0
 enum {
     kTypeDivXVer_3_11,
     kTypeDivXVer_4,
@@ -87,6 +90,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
-- 
cgit v1.2.3