diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 10:24:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-19 10:24:51 -0800 |
| commit | f69f356ebaf33aa150817c44ee2bd781f24e4e71 (patch) | |
| tree | 1824be54f914c36e981854b6eb9f7e78d34c6b58 /media | |
| parent | 550b1e17c332b1302299af0b3a8a2fa81d7cde65 (diff) | |
| parent | 14ac9546367d4df37eead55f6762b944b49f33b2 (diff) | |
| download | frameworks_base-f69f356ebaf33aa150817c44ee2bd781f24e4e71.zip frameworks_base-f69f356ebaf33aa150817c44ee2bd781f24e4e71.tar.gz frameworks_base-f69f356ebaf33aa150817c44ee2bd781f24e4e71.tar.bz2 | |
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*
Diffstat (limited to 'media')
| -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 ee03c52..965c370 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -65,7 +65,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); |