DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor

Bug: 15320804
Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e

diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index 6248e90..b74b2e2 100644 (file)
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -57,15 +57,6 @@ MediaCodecList::MediaCodecList()
 
     parseXMLFile(file);
 
-    if (mInitCheck == OK) {
-        // These are currently still used by the video editing suite.
-
-        addMediaCodec(true /* encoder */, "AACEncoder", "audio/mp4a-latm");
-
-        addMediaCodec(
-                false /* encoder */, "OMX.google.raw.decoder", "audio/raw");
-    }
-
 #if 0
     for (size_t i = 0; i < mCodecInfos.size(); ++i) {
         const CodecInfo &info = mCodecInfos.itemAt(i);