commit 349a733b58c3b4c656c4ddfa8cbbb06c008d3bc5
author Andreas Huber <andih@google.com> Wed Feb 17 15:06:51 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 17 15:06:51 2010 -0800
tree 6727f1b1c09b409b23abd22a7ac05cd0656ba622
parent 36e3ee0094e845ed9d2a1c755addecfde9db3a68
parent c2158a2f0fb68fe96d24b9bd85c32f15753d8ccb

Merge "Disable the TI AMR hardware decoder for audio decoding until its issues are resolved."

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 75b7b6f..6cf7cff 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -102,7 +102,6 @@
     { MEDIA_MIMETYPE_IMAGE_JPEG, "OMX.TI.JPEG.decode" },
     { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.TI.MP3.decode" },
     { MEDIA_MIMETYPE_AUDIO_MPEG, "MP3Decoder" },
-    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.TI.AMR.decode" },
     { MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBDecoder" },
     { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.TI.WBAMR.decode" },
     { MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBDecoder" },