diff options
| author | Andreas Huber <andih@google.com> | 2010-09-16 11:39:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:39:43 -0700 |
| commit | 63ce34be624dcc1f55635de7f128fc4e9abbbcbc (patch) | |
| tree | 488db13a095c1b8af7bc6468dc98376c1bcdf75c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 94c6e7e13577c7fc3e342fe70e0b569c4a153ac2 (diff) | |
| parent | 2b9f9821b10a141607da04d914b260ccfe817bed (diff) | |
am 62d4ebc0: 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 '62d4ebc0423831dfd8165d359e5b809f00f60656'
* commit '62d4ebc0423831dfd8165d359e5b809f00f60656':
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