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

Commit 5481142a authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t... 

am c45d3ad0: Merge "The .mkv parser lib leaves some tracks NULL if it doesn\'t support them." into honeycomb

* commit 'c45d3ad0':
  The .mkv parser lib leaves some tracks NULL if it doesn't support them.
parents 6e4a69bb c45d3ad0

media/libstagefright/matroska/MatroskaExtractor.cpp

+6 −0
Original line number Diff line number Diff line
@@ -707,6 +707,12 @@ void MatroskaExtractor::addTracks() { 
    for (size_t index = 0; index < tracks->GetTracksCount(); ++index) {

        const mkvparser::Track *track = tracks->GetTrackByIndex(index);



        if (track == NULL) {

            // Apparently this is currently valid (if unexpected) behaviour

            // of the mkv parser lib.

            continue;

        }



        const char *const codecID = track->GetCodecId();

        LOGV("codec id = %s", codecID);

        LOGV("codec name = %s", track->GetCodecNameAsUTF8());