commit 0c740a46d2877cedc3315e57ab967019240f5a15
author Mathias Agopian <mathias@google.com> Tue Nov 29 17:46:35 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 29 17:46:35 2011 -0800
tree 3d859fbffa0ef9495df1d244ac32b9e044b43105
parent e06a1748a48317adfb1bbe4ae4f49164cba03268
parent 86edf4f6470ee0f108bf40d3c1d23bf0a78c9c38

Merge changes I7e973a35,Ib3386fcc into ics-mr1

* changes:
  SurfaceTexture: add EGL_KHR_fence_sync option
  SurfaceTexture: add a blit-to-FBO test

include/ui/GraphicBuffer.h

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 @@
         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
     };