commit 8fbf202f7b9fa461f07b49470c2a6afe39ca6afd
author Jon Larimer <jlarimer@google.com> Wed Oct 21 03:27:35 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 03:27:35 2015 +0000
tree 9699d6a4d2e87d701187d93916621e1b7dff999b
parent 0378676b3f12158537a01916e69f6ab51817605f
parent 8e4f53159c64996e1617ec589977c290fa233010

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

* commit '8e4f53159c64996e1617ec589977c290fa233010':
  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 92cc771..2c472dc 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1878,7 +1878,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;