From 8284de3be2ac07d8774b15e6565df5aba084db04 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Wed, 29 Jan 2014 17:02:02 -0800
Subject: MPEG4Writer: use "mp42" as major/minor brand in ftyp box.

Bug: 12783430
Change-Id: I7c8029de1db21fcac0ce3e4505661189535c45f1
---
 media/libstagefright/MPEG4Writer.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to '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 @@ 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();
 }
 
-- 
cgit v1.1