diff options
| author | Andreas Huber <andih@google.com> | 2010-09-24 15:20:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 15:20:35 -0700 |
| commit | e5f3fd0b8e54a71d0c53c414650d2e8c60c31aaa (patch) | |
| tree | ceef43e44ad5622cd77e918994f8bb2f148e4172 /include/camera | |
| parent | 74aa142af3eefd53e676b0a57e6032c9340f561e (diff) | |
| parent | 2207a10949a7f3fe7ebf5a52974c45221d8acc46 (diff) | |
| download | frameworks_av-e5f3fd0b8e54a71d0c53c414650d2e8c60c31aaa.zip frameworks_av-e5f3fd0b8e54a71d0c53c414650d2e8c60c31aaa.tar.gz frameworks_av-e5f3fd0b8e54a71d0c53c414650d2e8c60c31aaa.tar.bz2 | |
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.
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions