diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-13 17:44:29 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-13 17:45:27 +0200 |
| commit | 47371bdb944652bb17b8b779fae102ce63dd36b7 (patch) | |
| tree | 495a2b71217a4fefe1c0672fce3d7cf9fabeb2e7 /osdep/priority.c | |
| parent | 4dc0e54d4fffa2b81fbf6fb9b875303638eb1c9a (diff) | |
| parent | 485f439cfefd4fa8d35f406fd8694e649bd536c8 (diff) | |
| download | mpv-47371bdb944652bb17b8b779fae102ce63dd36b7.tar.bz2 mpv-47371bdb944652bb17b8b779fae102ce63dd36b7.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
libvo/vo_kva.c
Diffstat (limited to 'osdep/priority.c')
| -rw-r--r-- | osdep/priority.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/osdep/priority.c b/osdep/priority.c index 0803a3299e..dfa2c54ff5 100644 --- a/osdep/priority.c +++ b/osdep/priority.c @@ -20,8 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "osdep.h" - #if defined(__MINGW32__) || defined(__CYGWIN__) #include <windows.h> #endif |