diff options
| author | wm4 <wm4@nowhere> | 2013-07-08 21:55:44 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-08 21:55:44 +0200 |
| commit | 31f685040bd2152d541ed16cf441c6b5e7e430fd (patch) | |
| tree | b8351b2847231bbc15d883a622ac972945cce6b4 /stream/cache.c | |
| parent | 73c76de91edbf8a55eb725196ff54583e3428510 (diff) | |
| parent | 7a71a2cc483d17bed94408d5aee6fba6893558cb (diff) | |
| download | mpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.bz2 mpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.xz | |
Merge branch 'master' into remove_old_demuxers
Conflicts:
DOCS/man/en/changes.rst
DOCS/man/en/options.rst
Diffstat (limited to 'stream/cache.c')
| -rw-r--r-- | stream/cache.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/stream/cache.c b/stream/cache.c index 4015aae82c..4a062538db 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -43,6 +43,7 @@ #include <assert.h> #include <pthread.h> #include <time.h> +#include <sys/time.h> #include <libavutil/common.h> |