diff options
| author | Lajos Molnar <lajos@google.com> | 2015-08-31 17:19:52 -0700 |
|---|---|---|
| committer | Jon Larimer <jlarimer@google.com> | 2015-10-02 20:41:47 +0000 |
| commit | 302b546bdccc777c1d3100510cd928e8bdf55fa5 (patch) | |
| tree | 35728701a097f499ac77277efa4bf9137c31e680 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 3737a3fa121796131ea5b782230e65dad9ccf90f (diff) | |
| download | frameworks_av-302b546bdccc777c1d3100510cd928e8bdf55fa5.zip frameworks_av-302b546bdccc777c1d3100510cd928e8bdf55fa5.tar.gz frameworks_av-302b546bdccc777c1d3100510cd928e8bdf55fa5.tar.bz2 | |
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Bug: 21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
(cherry picked from commit cf75af8f76265fb2909028f5dc68c7029dbe5f49)
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 92065d1..ca3e92f 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; |