Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb5b4896 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file."

parents 758cc74f c5b366a4

media/libstagefright/MPEG4Extractor.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1540,7 +1540,7 @@ bool SniffMPEG4( 




    if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8)

    if (!memcmp(header, "ftyp3gp", 7) || !memcmp(header, "ftypmp42", 8)

        || !memcmp(header, "ftypisom", 8) || !memcmp(header, "ftypM4V ", 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;

        *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4;

        *confidence = 0.1;

        *confidence = 0.1;