commit b44e95da772bb26fa9fc4cdc04cf51b7d42344ae
author Jon Larimer <jlarimer@google.com> Tue Oct 20 21:27:55 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 20 21:27:55 2015 +0000
tree 2652900dd60667dd8a2c9b08c38aa63b25920898
parent e550d21360287c752fd79a67f1962244ee272be1
parent 8565726f5775a6db97a394aa18a1f6b0e1ce69b7

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

media/libstagefright/MPEG4Extractor.cpp

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 @@
             // 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;