diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-17 18:40:31 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-17 18:40:31 -0800 |
| commit | 14ac9546367d4df37eead55f6762b944b49f33b2 (patch) | |
| tree | aa97cfd2a1bd9e2937892e7012d7c4bcdf24efdb | |
| parent | 27c06bab513a1893444d50bb5dedbad5c0100029 (diff) | |
| parent | b61d530575fbc278419435e7333f7eed8a4ae67b (diff) | |
| download | frameworks_base-14ac9546367d4df37eead55f6762b944b49f33b2.zip frameworks_base-14ac9546367d4df37eead55f6762b944b49f33b2.tar.gz frameworks_base-14ac9546367d4df37eead55f6762b944b49f33b2.tar.bz2 | |
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*"
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 2 |
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); |