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

Commit ea9ac8bf authored by Robert Shih's avatar Robert Shih
Browse files

MatroskaExtractor: skip track when codec id is NULL in addTracks 

Bug: 18872598
Change-Id: I0cdb2ffae202fc06b068c57dafae7523981b6000
parent 21db5728

media/libstagefright/matroska/MatroskaExtractor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -941,7 +941,10 @@ void MatroskaExtractor::addTracks() { 
                const mkvparser::VideoTrack *vtrack =

                    static_cast<const mkvparser::VideoTrack *>(track);



                if (!strcmp("V_MPEG4/ISO/AVC", codecID)) {

                if (codecID == NULL) {

                    ALOGW("unknown codecID is not supported.");

                    continue;

                } else if (!strcmp("V_MPEG4/ISO/AVC", codecID)) {

                    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC);

                    meta->setData(kKeyAVCC, 0, codecPrivate, codecPrivateSize);

                } else if (!strcmp("V_MPEG4/ISO/ASP", codecID)) {