diff options
| author | Andreas Huber <andih@google.com> | 2010-02-10 11:08:15 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-02-10 11:08:15 -0800 |
| commit | 01830a0814ae2db9141f49720d9e5aa2457854f0 (patch) | |
| tree | 7be43624ef01561a6e22256e648babab67fcd1fc /media | |
| parent | 6ed937ebe99088b5671a645060340a558b02fefb (diff) | |
| download | frameworks_base-01830a0814ae2db9141f49720d9e5aa2457854f0.zip frameworks_base-01830a0814ae2db9141f49720d9e5aa2457854f0.tar.gz frameworks_base-01830a0814ae2db9141f49720d9e5aa2457854f0.tar.bz2 | |
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; |