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 | 2207a10949a7f3fe7ebf5a52974c45221d8acc46 (patch) | |
| tree | 99cbe51ad13a80c59ad321e81088b1076848e4c2 /media/libeffects/visualizer | |
| parent | 7bfa78d39ecdc39eeccdbc07f3bb9538176f4209 (diff) | |
| parent | 76e2c7be04aeff55f3e6a473ff1cd6d9ec2d620c (diff) | |
| download | frameworks_av-2207a10949a7f3fe7ebf5a52974c45221d8acc46.zip frameworks_av-2207a10949a7f3fe7ebf5a52974c45221d8acc46.tar.gz frameworks_av-2207a10949a7f3fe7ebf5a52974c45221d8acc46.tar.bz2 | |
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 'media/libeffects/visualizer')
0 files changed, 0 insertions, 0 deletions