commit a9a25c3113b0c744f7d4e69c55fcd7a661ae4cfd
author Jean-Baptiste Queru <jbq@google.com> Fri Nov 19 10:24:51 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 19 10:24:51 2010 -0800
tree 193af386d2c7874b5a4058ef27f6ab1d84206ff9
parent beda607a0b2775484b10d7e6a15eec1e956b3cec
parent cf6a8d23345a6e54834e53b1eb7e465f3cb5e914

am 14ac9546: 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*"

* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
  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*

media/libstagefright/MediaExtractor.cpp

diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index ee03c52..965c370 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -65,7 +65,7 @@
     }
 
     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);