| commit | b4625e63fa48bac547f1fac2089adc290f64e536 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Mar 03 22:35:51 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 03 22:35:51 2016 +0000 |
| tree | 72bba8f5efaf763baadefbe972a51c21efa372a7 | |
| parent | f125dacbe505f97f4d8e051ecac49c571750dc95 [diff] | |
| parent | 0e5b95904cfd5ed2058c96c4292978192b610da5 [diff] |
Merge "NuPlayer: handle unsupported tracks - DO NOT MERGE"
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index 45da218..85a566e 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -213,6 +213,9 @@ sp<MediaSource> track = extractor->getTrack(i); sp<MetaData> meta = extractor->getTrackMetaData(i); + if (meta == NULL) { + continue; + } const char *mime; CHECK(meta->findCString(kKeyMIMEType, &mime));