diff options
| author | Andreas Huber <andih@google.com> | 2010-02-10 11:16:14 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-10 11:16:14 -0800 |
| commit | 4c48cb72ffc975c2a94473efb529d559aacaff17 (patch) | |
| tree | 2aab308ad53879ab9f8b4fc18a29e25c2f3e15ba /media | |
| parent | 7d574137946ea59a0f01dfda62ab46911d366a52 (diff) | |
| parent | 01830a0814ae2db9141f49720d9e5aa2457854f0 (diff) | |
| download | frameworks_base-4c48cb72ffc975c2a94473efb529d559aacaff17.zip frameworks_base-4c48cb72ffc975c2a94473efb529d559aacaff17.tar.gz frameworks_base-4c48cb72ffc975c2a94473efb529d559aacaff17.tar.bz2 | |
Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 4458006..1ff38ee 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -1540,7 +1540,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, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8)) { *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4; *confidence = 0.1; |