diff options
author | Andreas Huber <andih@google.com> | 2011-01-24 12:46:12 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2011-01-24 12:46:12 -0800 |
commit | 30ae68bccd8de6f0ab2acd22a6d661ace514343e (patch) | |
tree | 695613eb6de864f47baa0826e68419acc8fce720 /media/libstagefright/matroska | |
parent | e20e15bcfd0317f63ecf76e6b8e9fbd9196fde0b (diff) | |
download | frameworks_av-30ae68bccd8de6f0ab2acd22a6d661ace514343e.zip frameworks_av-30ae68bccd8de6f0ab2acd22a6d661ace514343e.tar.gz frameworks_av-30ae68bccd8de6f0ab2acd22a6d661ace514343e.tar.bz2 |
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
Diffstat (limited to 'media/libstagefright/matroska')
-rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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()); |