summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-03-28 01:45:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-28 01:45:11 +0000
commit1000d426bedb1ec38bdfff98fc8f004b64af13cb (patch)
tree97d6e219016a2ab6613ee979f3b0648274f0f2a6 /include
parent8bf96c011ff4128f9bf06b892a38d869192d6a25 (diff)
parentf780d28de2e3cf7f6b26b9626321dba75719736e (diff)
downloadframeworks_av-1000d426bedb1ec38bdfff98fc8f004b64af13cb.zip
frameworks_av-1000d426bedb1ec38bdfff98fc8f004b64af13cb.tar.gz
frameworks_av-1000d426bedb1ec38bdfff98fc8f004b64af13cb.tar.bz2
am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev
* commit 'f780d28de2e3cf7f6b26b9626321dba75719736e': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/ACodec.h1
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;