diff options
author | Rachad <rachad@google.com> | 2014-10-07 17:49:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 17:49:12 +0000 |
commit | 9d06b8026d551c24527d6f72f134046d94068c46 (patch) | |
tree | c38bef83a039a6c235abcbf5797c60f03e93f0be /include | |
parent | 2d15fb26bb0f03623127ed4cde9d546b5d42884e (diff) | |
parent | 42fc04ff4db20f2de12834818a73778ec9ede052 (diff) | |
download | frameworks_av-9d06b8026d551c24527d6f72f134046d94068c46.zip frameworks_av-9d06b8026d551c24527d6f72f134046d94068c46.tar.gz frameworks_av-9d06b8026d551c24527d6f72f134046d94068c46.tar.bz2 |
am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev
* commit '42fc04ff4db20f2de12834818a73778ec9ede052':
stagefright: do not allocate output buffers for tunneled playback
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 28e5c56..d77ddaf 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -217,6 +217,8 @@ private: bool mCreateInputBuffersSuspended; + bool mTunneled; + status_t setCyclicIntraMacroblockRefresh(const sp<AMessage> &msg, int32_t mode); status_t allocateBuffersOnPort(OMX_U32 portIndex); status_t freeBuffersOnPort(OMX_U32 portIndex); |