diff options
| author | Robert Shih <robertshih@google.com> | 2015-04-24 16:56:53 -0700 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2015-04-24 17:23:40 -0700 |
| commit | ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681 (patch) | |
| tree | 3b9cb6b6eec0c6dfc41311f790438c1010f4ba3f /media | |
| parent | 21db57282da8b3daba1549f3a8e41c4fbaf80059 (diff) | |
| download | frameworks_av-ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681.zip frameworks_av-ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681.tar.gz frameworks_av-ea9ac8bf7f6a7ae1424c6cade64b004caa7c3681.tar.bz2 | |
MatroskaExtractor: skip track when codec id is NULL in addTracks
Bug: 18872598
Change-Id: I0cdb2ffae202fc06b068c57dafae7523981b6000
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 0712bf0..ddca437 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -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)) { |