diff options
author | Rachad <rachad@google.com> | 2014-10-07 02:08:10 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 02:08:10 +0000 |
commit | 292cf155f105915f896877a7be83e46bdf4275d2 (patch) | |
tree | 4c741c08a58bb602824d7e6bd97623e4c95df36a /include | |
parent | 6160044825b0686e59c11ddbcaf56c8086da4022 (diff) | |
parent | 584c14c370f141685b7e8963a13ed91584383ca1 (diff) | |
download | frameworks_av-292cf155f105915f896877a7be83e46bdf4275d2.zip frameworks_av-292cf155f105915f896877a7be83e46bdf4275d2.tar.gz frameworks_av-292cf155f105915f896877a7be83e46bdf4275d2.tar.bz2 |
am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev
* commit '584c14c370f141685b7e8963a13ed91584383ca1':
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); |