diff options
| author | Andreas Huber <andih@google.com> | 2010-04-13 12:23:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 12:23:28 -0700 |
| commit | 59c7bab6d92de268f1f8b8f5c21622a690474daa (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8d9ffd0b976c5054ce7e5f1bddf1b081bbcb7dce (diff) | |
| parent | 5cfe7910a387a4976290d91bd6ea0408984a9431 (diff) | |
am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." in
Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken
* commit '30e9c2d4db145e02b5312ce29606b03dd78349d3':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions