diff options
| author | Dan Stoza <stoza@google.com> | 2014-11-07 20:03:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 20:03:45 +0000 |
| commit | 048e913d58a59055af81dfa362db2c4ccf00f75a (patch) | |
| tree | c707c6ae0286b1dc4a10fb2b9e5f13046ca18c8b /cmds/screenrecord/Overlay.h | |
| parent | 72e4a570f52c0a866d6952d0a1edd07d2c2194fc (diff) | |
| parent | f8d051fee37b1a0734e4142072d3053fed8df161 (diff) | |
| download | frameworks_av-048e913d58a59055af81dfa362db2c4ccf00f75a.zip frameworks_av-048e913d58a59055af81dfa362db2c4ccf00f75a.tar.gz frameworks_av-048e913d58a59055af81dfa362db2c4ccf00f75a.tar.bz2 | |
am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit 'f8d051fee37b1a0734e4142072d3053fed8df161':
Add a BufferItem parameter to onFrameAvailable
Diffstat (limited to 'cmds/screenrecord/Overlay.h')
| -rw-r--r-- | cmds/screenrecord/Overlay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/screenrecord/Overlay.h b/cmds/screenrecord/Overlay.h index b1b5c29..ee3444d 100644 --- a/cmds/screenrecord/Overlay.h +++ b/cmds/screenrecord/Overlay.h @@ -78,7 +78,7 @@ private: const Program& texRender, TextRenderer& textRenderer); // (overrides GLConsumer::FrameAvailableListener method) - virtual void onFrameAvailable(); + virtual void onFrameAvailable(const BufferItem& item); // (overrides Thread method) virtual bool threadLoop(); |