Andreas Huber 0b783bc2e4 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.
2010-09-24 15:20:35 -07:00
..
2010-03-18 17:45:15 -07:00
2010-02-11 14:41:20 -08:00