diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-28 01:50:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-28 01:50:50 +0000 |
| commit | 4f1ef2cd65d734edae17f8586cf717598b40f2c3 (patch) | |
| tree | ef7587a0fa6221794a277b87812ea23d54c85406 /include | |
| parent | ff382d0c40493303ceb81a6c22d1a48c0fecfe9c (diff) | |
| parent | 1000d426bedb1ec38bdfff98fc8f004b64af13cb (diff) | |
| download | frameworks_av-4f1ef2cd65d734edae17f8586cf717598b40f2c3.zip frameworks_av-4f1ef2cd65d734edae17f8586cf717598b40f2c3.tar.gz frameworks_av-4f1ef2cd65d734edae17f8586cf717598b40f2c3.tar.bz2 | |
am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb':
DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index c4f8c36..7ba5acc 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -203,7 +203,6 @@ private: unsigned mDequeueCounter; bool mStoreMetaDataInOutputBuffers; int32_t mMetaDataBuffersToSubmit; - size_t mNumUndequeuedBuffers; int64_t mRepeatFrameDelayUs; int64_t mMaxPtsGapUs; |