diff options
| author | Andreas Huber <andih@google.com> | 2010-09-24 10:44:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-24 10:44:01 -0700 |
| commit | d3eaa1524615d5b0f369c160b36f0a66cc664be0 (patch) | |
| tree | 5b3d05242cd96085a01eb327b04e2cd762dabebf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ea871eb0b148cd139648fbb68ab3771392a3c320 (diff) | |
| parent | 864ec8e074ae7a95398584c473e3153cf5d2a809 (diff) | |
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
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions