diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-29 17:26:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 17:26:32 -0800 |
| commit | 15031854d15ffcc5c955290f61aa59aa09e1fde9 (patch) | |
| tree | d0cf40e356b3fdd74a907275b45f41680287eb3f /media/libstagefright/SurfaceMediaSource.cpp | |
| parent | 8a1fac32b307cfa096b343f219d471365b657ad8 (diff) | |
| parent | 21befea3720fb847aef5440d507902d8705a671a (diff) | |
| download | frameworks_av-15031854d15ffcc5c955290f61aa59aa09e1fde9.zip frameworks_av-15031854d15ffcc5c955290f61aa59aa09e1fde9.tar.gz frameworks_av-15031854d15ffcc5c955290f61aa59aa09e1fde9.tar.bz2 | |
am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
Diffstat (limited to 'media/libstagefright/SurfaceMediaSource.cpp')
| -rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 2b27ee2..86b33d1 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -336,7 +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)) { - usage |= GraphicBuffer::USAGE_HW_TEXTURE; + usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER; status_t error; sp<GraphicBuffer> graphicBuffer( mGraphicBufferAlloc->createGraphicBuffer( |