Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
James Dong
2010-04-13 16:23:05 -07:00
committed by Android Git Automerger
parent 3cf6bba0b6 c33f583b7c
commit 748a8df0cd
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/MPEG4Extractor.cpp
View File

@@ -1642,6 +1642,8 @@ bool SniffMPEG4(
} }
if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8) 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, "ftypisom", 8) || !memcmp(header, "ftypM4V ", 8)
|| !memcmp(header, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8) || !memcmp(header, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8)
|| !memcmp(header, "ftypkddi", 8) || !memcmp(header, "ftypM4VP", 8)) { || !memcmp(header, "ftypkddi", 8) || !memcmp(header, "ftypM4VP", 8)) {