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

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

Browse Source 
Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken

* commit '4f3257cf4667aa28908c401634db849fd2e516af':
  Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
This commit is contained in:
James Dong
2010-04-13 15:42:01 -07:00
committed by Android Git Automerger
parent 2ae08f70f2 4f3257cf46
commit c33f583b7c
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)
|| !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)) {