diff options
| author | 2010-09-24 11:09:33 -0700 | |
|---|---|---|
| committer | 2010-09-24 11:09:33 -0700 | |
| commit | 3c358420460ec937f861f5e1a8f871d786b09285 (patch) | |
| tree | 23541fca7168217809dc320991efaad98ec45706 /libs/utils/StringArray.cpp | |
| parent | 3c6ca6dc2fb4237feccfe1d24fc82fea9b09bda9 (diff) | |
| parent | d3eaa1524615d5b0f369c160b36f0a66cc664be0 (diff) | |
am 6d8fae72: 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
Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp
* commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6':
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.
Diffstat (limited to 'libs/utils/StringArray.cpp')
0 files changed, 0 insertions, 0 deletions