diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-10-20 21:12:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 21:12:16 +0000 |
| commit | 781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e (patch) | |
| tree | 9e419be52af2e1d98ef404090af2f73ebfd108b1 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 5a018d15da438933c30de4b25bcff527331cf8df (diff) | |
| parent | b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa (diff) | |
| download | frameworks_av-781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e.zip frameworks_av-781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e.tar.gz frameworks_av-781cd4f37d4b81a8e5af45a3ba6cdd4cdd209a3e.tar.bz2 | |
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev
am: b1a13d01dc
* commit 'b1a13d01dccbc48ea54aeb4a4ba7fce636ff1daa':
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 7284d6a..2f27d1e 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1733,7 +1733,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; |