summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-10-26 20:34:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-26 20:34:38 +0000
commit71adab54edf9d0e2c89473d3be12edb6b9dc4549 (patch)
treebb97c3a8e32c085d22043754457555d14dedbe27 /include
parent1d2acaffde56ad79e6e96f228d7857863462397c (diff)
parent1765d6e0c962d2b89897c0278f969084f632d181 (diff)
downloadframeworks_av-71adab54edf9d0e2c89473d3be12edb6b9dc4549.zip
frameworks_av-71adab54edf9d0e2c89473d3be12edb6b9dc4549.tar.gz
frameworks_av-71adab54edf9d0e2c89473d3be12edb6b9dc4549.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')
-rw-r--r--include/media/stagefright/OMXCodec.h1
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);