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

Commit 79ccdb52 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box."

parents 964eda2d 8284de3b

media/libstagefright/MPEG4Writer.cpp

+6 −3
Original line number Diff line number Diff line
@@ -972,13 +972,16 @@ void MPEG4Writer::writeFtypBox(MetaData *param) { 
    if (param && param->findInt32(kKeyFileType, &fileType) &&

        fileType != OUTPUT_FORMAT_MPEG_4) {

        writeFourcc("3gp4");

        writeInt32(0);

        writeFourcc("isom");

        writeFourcc("3gp4");

    } else {

        writeFourcc("mp42");

        writeInt32(0);

        writeFourcc("isom");

        writeFourcc("mp42");

    }



    writeInt32(0);

    writeFourcc("isom");

    writeFourcc("3gp4");

    endBox();

}