commit 79ccdb52ee5de2a7f65b34e21970c40d1de2682a
author Robert Shih <robertshih@google.com> Mon Feb 03 21:52:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 03 21:52:25 2014 +0000
tree d2b59fd587a854693cad41fa8e071da1c5724137
parent 964eda2dd9e72dfaa6ff53c0b94fbf98ddb75132
parent 8284de3be2ac07d8774b15e6565df5aba084db04

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

media/libstagefright/MPEG4Writer.cpp

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 @@
     if (param && param->findInt32(kKeyFileType, &fileType) &&
         fileType != OUTPUT_FORMAT_MPEG_4) {
         writeFourcc("3gp4");
-    } else {
+        writeInt32(0);
         writeFourcc("isom");
+        writeFourcc("3gp4");
+    } else {
+        writeFourcc("mp42");
+        writeInt32(0);
+        writeFourcc("isom");
+        writeFourcc("mp42");
     }
 
-    writeInt32(0);
-    writeFourcc("isom");
-    writeFourcc("3gp4");
     endBox();
 }