diff options
author | Andreas Huber <andih@google.com> | 2010-09-24 10:44:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-24 10:44:01 -0700 |
commit | 6d8fae722cfb2833dd542b2a5e613582a9096fc6 (patch) | |
tree | 25a4c57e9fe7393e7ab4a064471e754b5ca51210 /cmds/am | |
parent | 8f97fe551e7bd95abf395eed303b975eaa8f0158 (diff) | |
parent | 3ac01190a73040dab6f23313adfbe2a2a16e19f1 (diff) | |
download | frameworks_base-6d8fae722cfb2833dd542b2a5e613582a9096fc6.zip frameworks_base-6d8fae722cfb2833dd542b2a5e613582a9096fc6.tar.gz frameworks_base-6d8fae722cfb2833dd542b2a5e613582a9096fc6.tar.bz2 |
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
Diffstat (limited to 'cmds/am')
0 files changed, 0 insertions, 0 deletions