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

Commit 10628bb5 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 748a8df0: am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file... 

am 748a8df0: am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
parents 6d46982a 748a8df0

media/libstagefright/MPEG4Extractor.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1642,6 +1642,8 @@ bool SniffMPEG4( 
    }



    if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8)

        || !memcmp(header, "ftyp3gr6", 8) || !memcmp(header, "ftyp3gs6", 8)

        || !memcmp(header, "ftyp3ge6", 8) || !memcmp(header, "ftyp3gg6", 8)

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

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

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