diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
| commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
| tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /libmpdemux/demuxer.h | |
| parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
| parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
| download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz | |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'libmpdemux/demuxer.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 76ab7221e4..58744f8a0f 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -1,6 +1,7 @@ #ifndef MPLAYER_DEMUXER_H #define MPLAYER_DEMUXER_H +#include <sys/types.h> #include <stdint.h> #include <stdlib.h> #include <string.h> |