summaryrefslogtreecommitdiffstats
path: root/include/ui
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-11-29 17:25:09 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-29 17:25:09 -0800
commite06a1748a48317adfb1bbe4ae4f49164cba03268 (patch)
treec5838660faaab5c38bbe755113931c88c63c2acf /include/ui
parent3c03f63b656346beee5f04dbfa02f07fec0b8360 (diff)
parentb7d87c40ef3f922fb10f6a4f24e6e1437ab3c7ae (diff)
downloadframeworks_native-e06a1748a48317adfb1bbe4ae4f49164cba03268.zip
frameworks_native-e06a1748a48317adfb1bbe4ae4f49164cba03268.tar.gz
frameworks_native-e06a1748a48317adfb1bbe4ae4f49164cba03268.tar.bz2
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Diffstat (limited to 'include/ui')
-rw-r--r--include/ui/GraphicBuffer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h
index b9deafc..6ab01f4 100644
--- a/include/ui/GraphicBuffer.h
+++ b/include/ui/GraphicBuffer.h
@@ -63,6 +63,7 @@ public:
USAGE_HW_RENDER = GRALLOC_USAGE_HW_RENDER,
USAGE_HW_2D = GRALLOC_USAGE_HW_2D,
USAGE_HW_COMPOSER = GRALLOC_USAGE_HW_COMPOSER,
+ USAGE_HW_VIDEO_ENCODER = GRALLOC_USAGE_HW_VIDEO_ENCODER,
USAGE_HW_MASK = GRALLOC_USAGE_HW_MASK
};