OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3069a6d
)
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
author
James Dong
<jdong@google.com>
Tue, 13 Apr 2010 22:06:41 +0000
(15:06 -0700)
committer
James Dong
<jdong@google.com>
Tue, 13 Apr 2010 22:09:26 +0000
(15:09 -0700)
bug -
2575956
Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
media/libstagefright/MPEG4Extractor.cpp
patch
|
blob
|
history
diff --git
a/media/libstagefright/MPEG4Extractor.cpp
b/media/libstagefright/MPEG4Extractor.cpp
index
0e21d08
..
323f145
100644
(file)
--- a/
media/libstagefright/MPEG4Extractor.cpp
+++ b/
media/libstagefright/MPEG4Extractor.cpp
@@
-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)) {