commit e5f3fd0b8e54a71d0c53c414650d2e8c60c31aaa
author Andreas Huber <andih@google.com> Fri Sep 24 15:20:35 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 24 15:20:35 2010 -0700
tree ceef43e44ad5622cd77e918994f8bb2f148e4172
parent 74aa142af3eefd53e676b0a57e6032c9340f561e
parent 2207a10949a7f3fe7ebf5a52974c45221d8acc46

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.