diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-10-20 21:19:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 21:19:00 +0000 |
| commit | 8565726f5775a6db97a394aa18a1f6b0e1ce69b7 (patch) | |
| tree | 7e90c9176d5281969e07a6e2611292c237c09515 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | f70b69a8b5ed044112516bf69f69905e521070b6 (diff) | |
| parent | 781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e (diff) | |
| download | frameworks_av-8565726f5775a6db97a394aa18a1f6b0e1ce69b7.zip frameworks_av-8565726f5775a6db97a394aa18a1f6b0e1ce69b7.tar.gz frameworks_av-8565726f5775a6db97a394aa18a1f6b0e1ce69b7.tar.bz2 | |
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc
am: 781cd4f37d
* commit '781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e':
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 b757f94..4c9b458 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1870,7 +1870,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; |