diff options
| author | ztenghui <ztenghui@google.com> | 2013-02-22 14:32:59 -0800 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2013-03-08 14:48:05 -0800 |
| commit | afde4e56566af19b36f1fe5e7aa7f226bf1703dd (patch) | |
| tree | 5b0cdd040810962afa5688be1def2eb6babf0de4 /cmds/stagefright/muxer.cpp | |
| parent | 10774e144b3c99afad9a5070ccf50fdb12b5fb4e (diff) | |
| download | frameworks_av-afde4e56566af19b36f1fe5e7aa7f226bf1703dd.zip frameworks_av-afde4e56566af19b36f1fe5e7aa7f226bf1703dd.tar.gz frameworks_av-afde4e56566af19b36f1fe5e7aa7f226bf1703dd.tar.bz2 | |
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
Diffstat (limited to 'cmds/stagefright/muxer.cpp')
| -rw-r--r-- | cmds/stagefright/muxer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ static int muxing( 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. |