diff options
| author | 2010-09-24 15:20:35 -0700 | |
|---|---|---|
| committer | 2010-09-24 15:20:35 -0700 | |
| commit | 68a63161cfbaf31a2e0cb886b0b3870d9da3ed99 (patch) | |
| tree | 3fdaaf7116dea950a9754e000a266c2674b8cfdd /libs/utils/StringArray.cpp | |
| parent | 0f95fe9b86454a890b4524336b61213fd40f7c58 (diff) | |
| parent | 3c358420460ec937f861f5e1a8f871d786b09285 (diff) | |
am a1c7b096: 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 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34'
* commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34':
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