commit 3db62dfc5102247d415df4667bd9609e669fc022
author ztenghui <ztenghui@google.com> Fri Feb 22 14:32:59 2013 -0800
committer ztenghui <ztenghui@google.com> Fri Mar 08 14:48:05 2013 -0800
tree 70ae686be3e35fb0a2af316d4d4fce733f06249c
parent bf04b5860182d8f4130dcb5d6d88ee68a58c99cd

Clean up the native code to match Java update

1. Add flags to match the java side change.
2. Update the interface.

bug:7991013

Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265

cmds/stagefright/muxer.cpp

diff --git a/cmds/stagefright/muxer.cpp b/cmds/stagefright/muxer.cpp
index 1b127c7..fac2acc 100644
--- a/cmds/stagefright/muxer.cpp
+++ b/cmds/stagefright/muxer.cpp
@@ -69,7 +69,8 @@
     ALOGV("input file %s, output file %s", path, outputFileName);
     ALOGV("useAudio %d, useVideo %d", useAudio, useVideo);
 
-    sp<MediaMuxer> muxer = new MediaMuxer(outputFileName);
+    sp<MediaMuxer> muxer = new MediaMuxer(outputFileName,
+                                          MediaMuxer::OUTPUT_FORMAT_MPEG_4);
 
     size_t trackCount = extractor->countTracks();
     // Map the extractor's track index to the muxer's track index.