tree 0fe5e5e4f3c1d4099e3a7ddfc5eed4a91bce2b7e
parent 2d457a32a653ad06487cf0fef9ef400f3055099a
parent 6d8fae722cfb2833dd542b2a5e613582a9096fc6
author Andreas Huber <andih@google.com> 1285351773 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285351773 -0700

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.