diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-10-20 20:55:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-20 20:55:20 +0000 |
| commit | b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa (patch) | |
| tree | 17fb9dd4a706a7d1cd6e58d1d39f87f652737c36 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 0f21a6880e74b56834940a131df912a49b70e82d (diff) | |
| parent | 302b546bdccc777c1d3100510cd928e8bdf55fa5 (diff) | |
| download | frameworks_av-b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa.zip frameworks_av-b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa.tar.gz frameworks_av-b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa.tar.bz2 | |
Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into klp-dev
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 72e5e3b..f0988eb 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1730,7 +1730,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); + } } *offset += chunk_size; |