summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-05-11 08:11:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-11 08:11:11 -0700
commit6e9fd1a24da7e9d7cabf0079a4291647154f8e39 (patch)
treee61fcfe6e39f1d7f397bd24009729ed05b1ddba6
parentdf659ac173b247b4ad440fb2979ff51ff45e0aa4 (diff)
parent4f4bedbfcbd443c9d0041a1e353d558fe6900757 (diff)
downloadframeworks_av-6e9fd1a24da7e9d7cabf0079a4291647154f8e39.zip
frameworks_av-6e9fd1a24da7e9d7cabf0079a4291647154f8e39.tar.gz
frameworks_av-6e9fd1a24da7e9d7cabf0079a4291647154f8e39.tar.bz2
Merge "Leave the number of output buffers up to surface flinger and friends."
-rw-r--r--media/libstagefright/colorconversion/SoftwareRenderer.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
index 3b13476..ee86148 100644
--- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp
+++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp
@@ -77,8 +77,6 @@ SoftwareRenderer::SoftwareRenderer(
GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN
| GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP));
- CHECK_EQ(0, native_window_set_buffer_count(mNativeWindow.get(), 2));
-
// Width must be multiple of 32???
CHECK_EQ(0, native_window_set_buffers_geometry(
mNativeWindow.get(),