diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-14 17:28:16 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-14 17:28:16 +0200 |
| commit | a3ab9e8e4649601281f78949e56b92755ae1142a (patch) | |
| tree | e31ee1ff4bafbfcf75c16259d9a64d18fea3bd51 /libvo/vo_macosx.m | |
| parent | f01f7f6259badb2725be49af914d8db52e025cf6 (diff) | |
| parent | bac1f05b4da4339b487e4e6ab972819142b3f13e (diff) | |
| download | mpv-a3ab9e8e4649601281f78949e56b92755ae1142a.tar.bz2 mpv-a3ab9e8e4649601281f78949e56b92755ae1142a.tar.xz | |
Merge svn changes up to r28149
Diffstat (limited to 'libvo/vo_macosx.m')
| -rw-r--r-- | libvo/vo_macosx.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index daede69573..24ffdc1e1f 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -10,6 +10,7 @@ #include <sys/types.h> #include <sys/ipc.h> #include <sys/mman.h> +#include <unistd.h> #include <CoreServices/CoreServices.h> //special workaround for Apple bug #6267445 //(OSServices Power API disabled in OSServices.h for 64bit systems) @@ -25,6 +26,8 @@ #include "aspect.h" #include "mp_msg.h" #include "m_option.h" +#include "mp_fifo.h" +#include "libvo/sub.h" #include "input/input.h" #include "input/mouse.h" @@ -729,7 +732,6 @@ static int control(uint32_t request, void *data) - (void) render { int curTime; - static int lastTime = 0; glClear(GL_COLOR_BUFFER_BIT); |