diff options
| author | Andreas Huber <andih@google.com> | 2011-11-29 16:33:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 16:33:04 -0800 |
| commit | 8afbf8e07fd1d75dfa0a517267beb6c1fa818027 (patch) | |
| tree | 12a598f6c9508bd248943bec6bf227bca25c4a3f /include | |
| parent | c089d02cf2bddf1bba6eaa2b2fcce149dc44633e (diff) | |
| parent | b96d3c5195b148c0d695a326fa9c315561d787ef (diff) | |
| download | frameworks_av-8afbf8e07fd1d75dfa0a517267beb6c1fa818027.zip frameworks_av-8afbf8e07fd1d75dfa0a517267beb6c1fa818027.tar.gz frameworks_av-8afbf8e07fd1d75dfa0a517267beb6c1fa818027.tar.bz2 | |
am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
If an error occurs that prevents us from reallocating buffers during a format change
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 5822877..3963d9c 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -166,6 +166,8 @@ private: bool allYourBuffersAreBelongToUs(); + size_t countBuffersOwnedByComponent(OMX_U32 portIndex) const; + void deferMessage(const sp<AMessage> &msg); void processDeferredMessages(); |