diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-10-21 03:27:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-21 03:27:35 +0000 |
| commit | 8fbf202f7b9fa461f07b49470c2a6afe39ca6afd (patch) | |
| tree | 9699d6a4d2e87d701187d93916621e1b7dff999b /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 0378676b3f12158537a01916e69f6ab51817605f (diff) | |
| parent | 8e4f53159c64996e1617ec589977c290fa233010 (diff) | |
| download | frameworks_av-8fbf202f7b9fa461f07b49470c2a6afe39ca6afd.zip frameworks_av-8fbf202f7b9fa461f07b49470c2a6afe39ca6afd.tar.gz frameworks_av-8fbf202f7b9fa461f07b49470c2a6afe39ca6afd.tar.bz2 | |
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57 am: b44e95da77 am: 699e9b0749
am: 8e4f53159c
* commit '8e4f53159c64996e1617ec589977c290fa233010':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 92cc771..2c472dc 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1878,7 +1878,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { // shall be 'text'. We also want to support 'sbtl' handler type // for a practical reason as various MPEG4 containers use it. if (type == FOURCC('t', 'e', 'x', 't') || type == FOURCC('s', 'b', 't', 'l')) { - mLastTrack->meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_TEXT_3GPP); + if (mLastTrack != NULL) { + mLastTrack->meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_TEXT_3GPP); + } } break; |