diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 09:46:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 09:46:11 -0700 |
commit | 2e90514be4c98b5fa6e1df5f2049a5e005a4263d (patch) | |
tree | 5a46f118a7f05da39b068489b61209ec63f23034 /media/libmediaplayerservice | |
parent | 45df6a2a25ff36606a5301155d8d97e9bf80d00b (diff) | |
parent | 4ac3585263ad59def5cf14756347cecab43e6e67 (diff) | |
download | frameworks_av-2e90514be4c98b5fa6e1df5f2049a5e005a4263d.zip frameworks_av-2e90514be4c98b5fa6e1df5f2049a5e005a4263d.tar.gz frameworks_av-2e90514be4c98b5fa6e1df5f2049a5e005a4263d.tar.bz2 |
am 1d628c5d: merge from open-source master
Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken
* commit '1d628c5d3dd7998b29c339292a2dc391015d0782':
Accept media files by file extension in case insensitive manner.
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 3100f6e..11f3016 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -754,7 +754,7 @@ player_type getPlayerType(const char* url) int len = strlen(FILE_EXTS[i].extension); int start = lenURL - len; if (start > 0) { - if (!strncmp(url + start, FILE_EXTS[i].extension, len)) { + if (!strncasecmp(url + start, FILE_EXTS[i].extension, len)) { if (FILE_EXTS[i].playertype == VORBIS_PLAYER && !strncasecmp(url, "http://", 7) && useStagefrightForHTTP) { |