commit | 76e2c7be04aeff55f3e6a473ff1cd6d9ec2d620c | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Fri Sep 24 10:44:01 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Sep 24 10:44:01 2010 -0700 |
tree | 30716de0189f366d1fc2d692e9754a15a9f757e3 | |
parent | 35dd00b82892c39351ab674ea5626e8065d18a2f [diff] | |
parent | ea314ac049884b31c5a2a4fecc42e8a50f928a33 [diff] |
Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread