Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fbf202f authored by Jon Larimer's avatar Jon Larimer Committed by android-build-merger
Browse files

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track"... 

Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" into klp-dev am: b1a13d01 am: 781cd4f3 am: 8565726f am: b44e95da am: 699e9b07
am: 8e4f5315

* commit '8e4f5315':
  stagefright: MPEG4Extractor: allow 'hdlr' box before first track
parents 0378676b 8e4f5315

media/libstagefright/MPEG4Extractor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1878,8 +1878,10 @@ 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')) {

                if (mLastTrack != NULL) {

                    mLastTrack->meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_TEXT_3GPP);

                }

            }



            break;

        }