From 30ae68bccd8de6f0ab2acd22a6d661ace514343e Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 24 Jan 2011 12:46:12 -0800 Subject: The .mkv parser lib leaves some tracks NULL if it doesn't support them. But it still counts them as valid tracks... Change-Id: I77e8fd24cce91a586e8e418759db55b6eba449c0 related-to-bug: 3377186 --- media/libstagefright/matroska/MatroskaExtractor.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'media/libstagefright/matroska') diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index eca9ed6..733de92 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -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()); -- cgit v1.1