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

2010-11-17 18:40:31 -08:00
parent 27c06bab51 b61d530575
commit 14ac954636
1 changed files with 1 additions and 1 deletions
--- 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);