drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad' into kraken

* commit 'f0e62b7a50e3f72a6e7bad510a2d605656b297ad':
  Support another kind of iso mpeg4 file.
This commit is contained in:
Andreas Huber
2010-04-02 11:26:55 -07:00
committed by Android Git Automerger
parent 942d070cc6 f0e62b7a50
commit 1f857164a5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/MPEG4Extractor.cpp
View File

@ -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;