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

Commit 1f857164 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am f0e62b7a: am 29039dee: Merge "Support another kind of iso mpeg4 file." into froyo 

Merge commit 'f0e62b7a' into kraken

* commit 'f0e62b7a':
  Support another kind of iso mpeg4 file.
parents 942d070c f0e62b7a

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1626,7 +1626,7 @@ bool SniffMPEG4( 
    if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8)

        || !memcmp(header, "ftypisom", 8) || !memcmp(header, "ftypM4V ", 8)

        || !memcmp(header, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8)

        || !memcmp(header, "ftypkddi", 8)) {

        || !memcmp(header, "ftypkddi", 8) || !memcmp(header, "ftypM4VP", 8)) {

        *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4;

        *confidence = 0.1;