diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-29 17:25:09 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-29 17:25:09 -0800 |
| commit | 21befea3720fb847aef5440d507902d8705a671a (patch) | |
| tree | d0cf40e356b3fdd74a907275b45f41680287eb3f /media | |
| parent | 7609b2304379fd6d3e5c8d13a34c680441dc48b6 (diff) | |
| parent | 4c57986f963c81fc7c2455deb113c9b32b135468 (diff) | |
| download | frameworks_av-21befea3720fb847aef5440d507902d8705a671a.zip frameworks_av-21befea3720fb847aef5440d507902d8705a671a.tar.gz frameworks_av-21befea3720fb847aef5440d507902d8705a671a.tar.bz2 | |
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Diffstat (limited to 'media')
| -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( |