summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Bady <aegirxx@googlemail.com>2010-11-18 00:22:48 +0100
committerMatthias Bady <aegirxx@googlemail.com>2010-11-18 00:22:48 +0100
commitcf6a8d23345a6e54834e53b1eb7e465f3cb5e914 (patch)
tree03970c471ae0321c1faff333e53e886c97e35f7d
parentbf955268acc4a5a73632cb5f64093d1796c769df (diff)
downloadframeworks_av-cf6a8d23345a6e54834e53b1eb7e465f3cb5e914.zip
frameworks_av-cf6a8d23345a6e54834e53b1eb7e465f3cb5e914.tar.gz
frameworks_av-cf6a8d23345a6e54834e53b1eb7e465f3cb5e914.tar.bz2
build failed with g++ v. 4.4.5
err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char* Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
-rw-r--r--media/libstagefright/MediaExtractor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index a8019ee..47fd698 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -59,7 +59,7 @@ sp<MediaExtractor> MediaExtractor::Create(
}
if (!strncmp(mime, "drm", 3)) {
- char *originalMime = strrchr(mime, '+') + 1;
+ const char *originalMime = strrchr(mime, '+') + 1;
if (!strncmp(mime, "drm+es_based", 12)) {
return new DRMExtractor(source, originalMime);