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

Commit 44beb98b authored by The Android Automerger's avatar The Android Automerger
Browse files

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

parent b5aaa4a4

media/libstagefright/SurfaceMediaSource.cpp

+1 −3
Original line number Diff line number Diff line
@@ -336,9 +336,7 @@ status_t SurfaceMediaSource::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, 
        (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(