diff options
| author | Andreas Huber <andih@google.com> | 2010-04-12 17:18:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-12 17:18:43 -0700 |
| commit | 958a290a7ca2ebe755b7c2dd623c2568ffe16ec8 (patch) | |
| tree | 3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 39cdc3ceb767f14222f7447ccb4fa1d1e201fd30 (diff) | |
| parent | 692dc8a970b48057ac268667bfcc69e584d61542 (diff) | |
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 '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp
* commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
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