Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a25c31 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg:... 

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*
parents beda607a cf6a8d23

media/libstagefright/MediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);