summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-05-29 07:34:59 -0700
committerLajos Molnar <lajos@google.com>2014-05-29 07:38:02 -0700
commit17a6dd60f5f8a28af1db451bcbf44805648c844a (patch)
tree5647fc94c28af2ae65f2d4b07f1b73725dc552e8 /media
parente32106fd5175afdf939ae397aece9caf378a4912 (diff)
downloadframeworks_av-17a6dd60f5f8a28af1db451bcbf44805648c844a.zip
frameworks_av-17a6dd60f5f8a28af1db451bcbf44805648c844a.tar.gz
frameworks_av-17a6dd60f5f8a28af1db451bcbf44805648c844a.tar.bz2
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Bug: 15320804 Change-Id: I1c2f0f75aeaabc20cb94e79e47b70f7faefe0a9e
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MediaCodecList.cpp9
1 files changed, 0 insertions, 9 deletions
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);