| commit | e5a1316220ab981b5cdf54fce11aa6d81478deb2 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Mar 15 10:38:00 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 15 10:38:00 2010 -0700 |
| tree | c22d524a20003f92c5cafe9d62bf7c451fa1d4bb | |
| parent | 4b8b0150eac981eb088b3765cfb14f663f7f040c [diff] | |
| parent | 7b409b07e561a81f767369fa8c685481fab2deee [diff] |
Merge "Fix the media metadata retriever (tests). The native constants must match those published at the java layer."
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index fa25fa9..9407bd5 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp
@@ -1488,7 +1488,7 @@ height = cbSurface.height - y; int err = copyPixels(c, - surface, xoffset, yoffset, + txSurface, xoffset, yoffset, cbSurface, x, y, width, height); if (err) { ogles_error(c, err);