diff options
| author | Andreas Huber <andih@google.com> | 2010-09-24 11:09:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 11:09:33 -0700 |
| commit | a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34 (patch) | |
| tree | 0fe5e5e4f3c1d4099e3a7ddfc5eed4a91bce2b7e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2d457a32a653ad06487cf0fef9ef400f3055099a (diff) | |
| parent | 6d8fae722cfb2833dd542b2a5e613582a9096fc6 (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 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions