diff options
| author | Andreas Huber <andih@google.com> | 2010-04-12 17:21:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-12 17:21:33 -0700 |
| commit | ae630622bf5632124494bdf977288597921bf974 (patch) | |
| tree | c4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b3815412f0b46718330febf8c54a8b67c53b7f51 (diff) | |
| parent | 958a290a7ca2ebe755b7c2dd623c2568ffe16ec8 (diff) | |
am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken
* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions