summaryrefslogtreecommitdiffstats
path: root/libs/surfaceflinger/TextureManager.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-07-14 16:39:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-14 16:39:42 -0700
commit172b79e9df9a5689681cf0355921ec2445bc9f6f (patch)
tree9c5d643f03c7a8b170945dbf0ae8e36fc8070e62 /libs/surfaceflinger/TextureManager.cpp
parent0d60b96a8fecae55907bb07f49a267c23965617e (diff)
parent98704f14eaeef6c9bcb73fea162f4941dd9bbd87 (diff)
downloadframeworks_base-172b79e9df9a5689681cf0355921ec2445bc9f6f.zip
frameworks_base-172b79e9df9a5689681cf0355921ec2445bc9f6f.tar.gz
frameworks_base-172b79e9df9a5689681cf0355921ec2445bc9f6f.tar.bz2
am 98704f14: am 38eea8bf: Merge "Remove the YV16 format for simplicity\'s sake." into gingerbread
Merge commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87' * commit '98704f14eaeef6c9bcb73fea162f4941dd9bbd87': Remove the YV16 format for simplicity's sake.
Diffstat (limited to 'libs/surfaceflinger/TextureManager.cpp')
-rw-r--r--libs/surfaceflinger/TextureManager.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/surfaceflinger/TextureManager.cpp b/libs/surfaceflinger/TextureManager.cpp
index 6526032..3b326df 100644
--- a/libs/surfaceflinger/TextureManager.cpp
+++ b/libs/surfaceflinger/TextureManager.cpp
@@ -107,7 +107,6 @@ bool TextureManager::isSupportedYuvFormat(int format)
{
switch (format) {
case HAL_PIXEL_FORMAT_YV12:
- case HAL_PIXEL_FORMAT_YV16:
return true;
}
return false;
@@ -118,7 +117,6 @@ bool TextureManager::isYuvFormat(int format)
switch (format) {
// supported YUV formats
case HAL_PIXEL_FORMAT_YV12:
- case HAL_PIXEL_FORMAT_YV16:
// Legacy/deprecated YUV formats
case HAL_PIXEL_FORMAT_YCbCr_422_SP:
case HAL_PIXEL_FORMAT_YCrCb_420_SP: