diff options
| author | Andreas Huber <andih@google.com> | 2010-09-16 11:36:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:36:12 -0700 |
| commit | 2b9f9821b10a141607da04d914b260ccfe817bed (patch) | |
| tree | 5ae8dabac40a6749a21bcb79a56ecc6c2e3a99b0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | faedd14a3aafac44286290d2a49a10eb21ab3872 (diff) | |
| parent | 2cd0ad397b5c6b50a1bb5b5d124e0a50d21fafed (diff) | |
am 49e1ae22: Merge "Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead." into gingerbread
Merge commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f' into gingerbread-plus-aosp
* commit '49e1ae22801f5f9e620552ffd205b05a0d89f65f':
Sometimes the avc software decoder will signal that a frame is ready but then unexpectedly fail to return the frame... stop asserting on that and return an error instead.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions