commit 6ff7918ba1c8b6b53c777dcb0b64992b5dd2a1f1
author James Dong <jdong@google.com> Fri Jun 15 10:19:22 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 15 10:19:22 2012 -0700
tree 90c0f01f5ddfb353e36c735b3c4829523de8b566
parent 4bb2253be6855ab2446fe2344a8a57487e3f5024
parent fbb26f5101d9ef14251d561dba37f87d001fbbf6

am fbb26f51: am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev

* commit 'fbb26f5101d9ef14251d561dba37f87d001fbbf6':
  Fix track selection code in AwesomePlayer

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index d7f721f..0f346d8 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -2440,7 +2440,7 @@
         CHECK(meta->findCString(kKeyMIMEType, &mime));
         isAudioTrack = !strncasecmp(mime, "audio/", 6);
 
-        if (!isAudioTrack && !strcasecmp(mime, MEDIA_MIMETYPE_TEXT_3GPP)) {
+        if (!isAudioTrack && strcasecmp(mime, MEDIA_MIMETYPE_TEXT_3GPP) != 0) {
             ALOGE("Track %d is not either audio or timed text", trackIndex);
             return ERROR_UNSUPPORTED;
         }