diff options
| author | Lajos Molnar <lajos@google.com> | 2015-08-31 17:19:52 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-09-02 14:04:12 -0700 |
| commit | 5e646341aa496c857a6740d9c802b6b06dae8a02 (patch) | |
| tree | 7d7f6ce049d9d5c7ee8fe0687235ec33ff147c43 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 582757713e2a0cab2fc45e217bf59ab495e1a942 (diff) | |
| download | frameworks_av-5e646341aa496c857a6740d9c802b6b06dae8a02.zip frameworks_av-5e646341aa496c857a6740d9c802b6b06dae8a02.tar.gz frameworks_av-5e646341aa496c857a6740d9c802b6b06dae8a02.tar.bz2 | |
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Bug: 21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index a76334f..38ae6f3 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1952,15 +1952,14 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { return ERROR_IO; } - if (mLastTrack == NULL) - return ERROR_MALFORMED; - uint32_t type = ntohl(buffer); // For the 3GPP file format, the handler-type within the 'hdlr' box // 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; |