diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 15:24:11 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 15:24:11 -0700 |
commit | 4a3935898893f955403021fe41cf2bfa3a32dde2 (patch) | |
tree | c5d7fc3e8a6d2962fcc977f1daea834f23b24588 /media/libmedia | |
parent | e246a940426d418b99cf62c547c7a2093811f2fb (diff) | |
parent | f1a97e53a58f47afa17a9b0d3a5cc9abf7e5ed19 (diff) | |
download | frameworks_av-4a3935898893f955403021fe41cf2bfa3a32dde2.zip frameworks_av-4a3935898893f955403021fe41cf2bfa3a32dde2.tar.gz frameworks_av-4a3935898893f955403021fe41cf2bfa3a32dde2.tar.bz2 |
resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/MediaScanner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp index 6f581d3..c5112a5 100644 --- a/media/libmedia/MediaScanner.cpp +++ b/media/libmedia/MediaScanner.cpp @@ -81,13 +81,13 @@ status_t MediaScanner::processDirectory( } static bool fileMatchesExtension(const char* path, const char* extensions) { - char* extension = strrchr(path, '.'); + const char* extension = strrchr(path, '.'); if (!extension) return false; ++extension; // skip the dot if (extension[0] == 0) return false; while (extensions[0]) { - char* comma = strchr(extensions, ','); + const char* comma = strchr(extensions, ','); size_t length = (comma ? comma - extensions : strlen(extensions)); if (length == strlen(extension) && strncasecmp(extension, extensions, length) == 0) return true; extensions += length; |