Merge "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*"

Jean-Baptiste Queru · Android Code Review · commit 14ac9546367d · 2010-11-17T18:40:31.000-08:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ sp<MediaExtractor> MediaExtractor::Create(`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (!strncmp(mime, "drm", 3)) {`
`62`		`- char *originalMime = strrchr(mime, '+') + 1;`
	`62`	`+ const char *originalMime = strrchr(mime, '+') + 1;`
`63`	`63`
`64`	`64`	`if (!strncmp(mime, "drm+es_based", 12)) {`
`65`	`65`	`return new DRMExtractor(source, originalMime);`