diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-11-30 10:50:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 10:50:49 -0800 |
| commit | cd9e929c8490d1410e6d99c9b54585cb2fea569c (patch) | |
| tree | 0c7af0196b7825ef755512254220874186af4d1b /media/libstagefright/SurfaceMediaSource.cpp | |
| parent | ea9d51bd710e6739077a3700f27a1c37767a2f6d (diff) | |
| parent | 15031854d15ffcc5c955290f61aa59aa09e1fde9 (diff) | |
| download | frameworks_av-cd9e929c8490d1410e6d99c9b54585cb2fea569c.zip frameworks_av-cd9e929c8490d1410e6d99c9b54585cb2fea569c.tar.gz frameworks_av-cd9e929c8490d1410e6d99c9b54585cb2fea569c.tar.bz2 | |
am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6':
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 24e0d8c..51a7541 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -338,7 +338,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( |