commit 44beb98b085f8e221fbe471523e69a0d174704b4
author The Android Automerger <android-build@android.com> Thu Dec 15 20:50:02 2011 -0800
committer The Android Automerger <android-build@android.com> Thu Dec 15 20:50:02 2011 -0800
tree 52cb291bf974f4593277cc1142e514ebadae4b89
parent b5aaa4a4d8f3c6f8be574b6ad8bd20fb74da6b9c

merge in ics-mr1-release history after reset to ics-mr1

media/libstagefright/SurfaceMediaSource.cpp

diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index 38daf72..86b33d1 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -336,9 +336,7 @@
         (uint32_t(buffer->height) != h) ||
         (uint32_t(buffer->format) != format) ||
         ((uint32_t(buffer->usage) & usage) != usage)) {
-            // XXX: This will be changed to USAGE_HW_VIDEO_ENCODER once driver
-            // issues with that flag get fixed.
-            usage |= GraphicBuffer::USAGE_HW_TEXTURE;
+            usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER;
             status_t error;
             sp<GraphicBuffer> graphicBuffer(
                     mGraphicBufferAlloc->createGraphicBuffer(