diff options
author | Rene Bolldorf <xsecute@googlemail.com> | 2010-08-17 23:32:58 +0200 |
---|---|---|
committer | Rene Bolldorf <xsecute@googlemail.com> | 2010-08-17 23:45:14 +0200 |
commit | 0b7bd95d69763573b87f95d4e9cab7d7358e9b93 (patch) | |
tree | 0eefc323b421507ef33c6cf047785d5bbd0933c7 /media | |
parent | be50507bae350a8dea2a1a865513c31317d4cde9 (diff) | |
download | frameworks_base-0b7bd95d69763573b87f95d4e9cab7d7358e9b93.zip frameworks_base-0b7bd95d69763573b87f95d4e9cab7d7358e9b93.tar.gz frameworks_base-0b7bd95d69763573b87f95d4e9cab7d7358e9b93.tar.bz2 |
Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')
Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/MediaScanner.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/HTTPDataSource.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp index 843a8fd..af7f07a 100644 --- a/media/libmedia/MediaScanner.cpp +++ b/media/libmedia/MediaScanner.cpp @@ -77,13 +77,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; diff --git a/media/libstagefright/HTTPDataSource.cpp b/media/libstagefright/HTTPDataSource.cpp index f72a6cc..521c3c8 100644 --- a/media/libstagefright/HTTPDataSource.cpp +++ b/media/libstagefright/HTTPDataSource.cpp @@ -158,7 +158,7 @@ HTTPDataSource::HTTPDataSource( string path; int port; - char *slash = strchr(uri + 7, '/'); + const char *slash = strchr(uri + 7, '/'); if (slash == NULL) { host = uri + 7; path = "/"; @@ -167,7 +167,7 @@ HTTPDataSource::HTTPDataSource( path = slash; } - char *colon = strchr(host.c_str(), ':'); + const char *colon = strchr(host.c_str(), ':'); if (colon == NULL) { port = 80; } else { |