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

Commit 56e2689a authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Don't CHECK when metadata is missing mime type"

parents 3e5de385 e480de88

media/libstagefright/StagefrightMetadataRetriever.cpp

+2 −2
Original line number Diff line number Diff line
@@ -754,9 +754,9 @@ void StagefrightMetadataRetriever::parseMetaData() { 


    if (numTracks == 1) {

        const char *fileMIME;

        CHECK(meta->findCString(kKeyMIMEType, &fileMIME));



        if (!strcasecmp(fileMIME, "video/x-matroska")) {

        if (meta->findCString(kKeyMIMEType, &fileMIME) &&

                !strcasecmp(fileMIME, "video/x-matroska")) {

            sp<MetaData> trackMeta = mExtractor->getTrackMetaData(0);

            const char *trackMIME;

            CHECK(trackMeta->findCString(kKeyMIMEType, &trackMIME));