Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d22dc8 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1

* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
  SurfaceMediaSource: use the vid enc usage bit
parents 2c20a13e b63de44c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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
    };