From 17a6dd60f5f8a28af1db451bcbf44805648c844a Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Thu, 29 May 2014 07:34:59 -0700 Subject: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor Bug: 15320804 Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e --- media/libstagefright/MediaCodecList.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'media') diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 6248e90..b74b2e2 100644 --- 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); -- cgit v1.1