summaryrefslogtreecommitdiffstats
path: root/src/emu/video.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-07-21 12:35:03 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2019-07-21 12:35:03 +1000
commitdac4ed89a80685fd3a6076eb76d6649df46f02d4 (patch)
tree217ea69c017fbec45a7c732f5655914aea8a01ea /src/emu/video.cpp
parentd2926fa02cef5bf728eac74c9e5586aced02a80b (diff)
parent1440861929a344f4bd7f78616854e041f55702d5 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/emu/video.cpp')
-rw-r--r--src/emu/video.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emu/video.cpp b/src/emu/video.cpp
index c4ade5f7948..2c1617e4fb2 100644
--- a/src/emu/video.cpp
+++ b/src/emu/video.cpp
@@ -788,7 +788,7 @@ inline bool video_manager::effective_autoframeskip() const
// forward
//-------------------------------------------------
-inline int video_manager::effective_frameskip() const
+int video_manager::effective_frameskip() const
{
// if we're fast forwarding, use the maximum frameskip
if (m_fastforward)