summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-14 09:46:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-14 09:46:11 -0700
commit21a534d955c8d45c50dafaf05cf2afbb8cf3696c (patch)
tree98cc6ff98a60eef761cb64e9acc157e8fb2ee204 /media/libmediaplayerservice
parent9f0810e8c72cf3c694a5f1cf608b26ed490d9bd6 (diff)
parent1d628c5d3dd7998b29c339292a2dc391015d0782 (diff)
downloadframeworks_base-21a534d955c8d45c50dafaf05cf2afbb8cf3696c.zip
frameworks_base-21a534d955c8d45c50dafaf05cf2afbb8cf3696c.tar.gz
frameworks_base-21a534d955c8d45c50dafaf05cf2afbb8cf3696c.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.cpp2
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) {