diff options
author | Lajos Molnar <lajos@google.com> | 2014-06-05 14:39:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 14:39:59 +0000 |
commit | cb3d3a365c91ed996c47dea6ff1490f2f13c1b52 (patch) | |
tree | 3aaf011f2461335493c91ac97821c2f28d22c59b /media | |
parent | b6af7c635113d288d16a4f549679beffd86822d8 (diff) | |
parent | 17a6dd60f5f8a28af1db451bcbf44805648c844a (diff) | |
download | frameworks_av-cb3d3a365c91ed996c47dea6ff1490f2f13c1b52.zip frameworks_av-cb3d3a365c91ed996c47dea6ff1490f2f13c1b52.tar.gz frameworks_av-cb3d3a365c91ed996c47dea6ff1490f2f13c1b52.tar.bz2 |
am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
* commit '17a6dd60f5f8a28af1db451bcbf44805648c844a':
DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 9 |
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); |