diff options
| author | James Dong <jdong@google.com> | 2012-06-15 10:16:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-15 10:16:34 -0700 |
| commit | fbb26f5101d9ef14251d561dba37f87d001fbbf6 (patch) | |
| tree | 2ce468c14b9fb9f036cb2b01aeb50d002358b3ef /media/libstagefright | |
| parent | ff0fcb2628613953f454875006bfb78c3fc087d3 (diff) | |
| parent | fc42e16d96b7e1b18b573f40df1319c56f8ab933 (diff) | |
| download | frameworks_av-fbb26f5101d9ef14251d561dba37f87d001fbbf6.zip frameworks_av-fbb26f5101d9ef14251d561dba37f87d001fbbf6.tar.gz frameworks_av-fbb26f5101d9ef14251d561dba37f87d001fbbf6.tar.bz2 | |
am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev
* commit 'fc42e16d96b7e1b18b573f40df1319c56f8ab933':
Fix track selection code in AwesomePlayer
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ status_t AwesomePlayer::selectTrack(size_t trackIndex, bool select) { 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; } |