diff options
| author | Jon Larimer <jlarimer@google.com> | 2015-10-20 21:27:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 21:27:55 +0000 |
| commit | b44e95da772bb26fa9fc4cdc04cf51b7d42344ae (patch) | |
| tree | 2652900dd60667dd8a2c9b08c38aa63b25920898 /media | |
| parent | e550d21360287c752fd79a67f1962244ee272be1 (diff) | |
| parent | 8565726f5775a6db97a394aa18a1f6b0e1ce69b7 (diff) | |
| download | frameworks_av-b44e95da772bb26fa9fc4cdc04cf51b7d42344ae.zip frameworks_av-b44e95da772bb26fa9fc4cdc04cf51b7d42344ae.tar.gz frameworks_av-b44e95da772bb26fa9fc4cdc04cf51b7d42344ae.tar.bz2 | |
Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d
am: 8565726f57
* commit '8565726f5775a6db97a394aa18a1f6b0e1ce69b7':
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Diffstat (limited to 'media')
| -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; |