diff options
| author | Robert Shih <robertshih@google.com> | 2014-01-29 17:02:02 -0800 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2014-01-30 14:52:18 -0800 |
| commit | 8284de3be2ac07d8774b15e6565df5aba084db04 (patch) | |
| tree | de05133ff55f8fdfa2e6f9f936c049141219351d /media/libstagefright/MPEG4Writer.cpp | |
| parent | 9be49c915852b592a881be3905658e4fc698749d (diff) | |
| download | frameworks_av-8284de3be2ac07d8774b15e6565df5aba084db04.zip frameworks_av-8284de3be2ac07d8774b15e6565df5aba084db04.tar.gz frameworks_av-8284de3be2ac07d8774b15e6565df5aba084db04.tar.bz2 | |
MPEG4Writer: use "mp42" as major/minor brand in ftyp box.
Bug: 12783430
Change-Id: I7c8029de1db21fcac0ce3e4505661189535c45f1
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index a0f17b5..b7a4b75 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -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(); } |