commit 699e9b0749bda03d12d6aaea9632b28d2bd9e6fb
author Jon Larimer <jlarimer@google.com> Wed Oct 21 03:18:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 03:18:32 2015 +0000
tree 764b7de328a7b82ed66797cc9348b8dc6799c0e7
parent b1231923f134a167a0351091d8944b7583928a4f
parent b44e95da772bb26fa9fc4cdc04cf51b7d42344ae

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01dc am: 781cd4f37d am: 8565726f57
am: b44e95da77

* commit 'b44e95da772bb26fa9fc4cdc04cf51b7d42344ae':
  stagefright: MPEG4Extractor: allow 'hdlr' box before first track

media/libstagefright/MPEG4Extractor.cpp

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 7d7cf07..2550253 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1873,7 +1873,9 @@
             // 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;