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*
This commit is contained in:
committed by
Android Git Automerger
commit
f69f356eba
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user