diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-10-26 20:34:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-26 20:34:38 +0000 |
| commit | 5ded5fc55f2da2af0a76a9ddc52d27948b227037 (patch) | |
| tree | 56d574dfaee8cd32f7f732a90e247f5cedafc1f5 /include/media | |
| parent | 6f444425fe1bb62e12973c5df6a3161bc2aa2ce7 (diff) | |
| parent | b7b4eaaa05284634d50d581d924a250f1194f66d (diff) | |
| download | frameworks_base-5ded5fc55f2da2af0a76a9ddc52d27948b227037.zip frameworks_base-5ded5fc55f2da2af0a76a9ddc52d27948b227037.tar.gz frameworks_base-5ded5fc55f2da2af0a76a9ddc52d27948b227037.tar.bz2 | |
am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit 'b7b4eaaa05284634d50d581d924a250f1194f66d':
Stagefright: push blank buffers when tearing down
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 0d5a726..c21d19d 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -277,6 +277,7 @@ private: status_t queueBufferToNativeWindow(BufferInfo *info); status_t cancelBufferToNativeWindow(BufferInfo *info); BufferInfo* dequeueBufferFromNativeWindow(); + status_t pushBlankBuffersToNativeWindow(); status_t freeBuffersOnPort( OMX_U32 portIndex, bool onlyThoseWeOwn = false); |