1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 20:34:58 +00:00
mpv/osdep
wm4 6de8120822 Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
	command.c
	mp_core.h
	mplayer.c
	screenshot.c
2012-03-16 19:14:44 +01:00
..
getch2-os2.c input: move all key code lists to input/keycodes.h 2011-05-02 00:43:31 +03:00
getch2-win.c windows: terminal: unicode, --msgcolor, size change 2012-03-09 20:48:54 +02:00
getch2.c input: restore terminal attributes after resume 2012-02-25 16:40:14 +01:00
getch2.h input: make slave command file descriptors nonblocking 2011-05-04 18:53:17 +03:00
gettimeofday.c osdep: Fix gettimeofday type to match the real one 2010-11-02 04:14:44 +02:00
glob-win.c osdep: tweak some #includes 2011-01-31 16:03:10 +02:00
glob.h Add standard license headers to files. 2009-03-01 13:13:25 +00:00
io.c windows: terminal: unicode, --msgcolor, size change 2012-03-09 20:48:54 +02:00
io.h windows: terminal: unicode, --msgcolor, size change 2012-03-09 20:48:54 +02:00
macosx_finder_args.c options: change option parsing to use bstr 2011-07-29 05:50:38 +03:00
macosx_finder_args.h osdep/macosx_finder_args.h: include required header m_config.h 2010-11-02 04:16:46 +02:00
mmap_anon.c #include corresponding .h files in .c files. 2010-02-16 15:03:03 +00:00
mmap_anon.h Add standard license headers to files. 2009-03-01 13:13:25 +00:00
mmap-os2.c osdep: tweak some #includes 2011-01-31 16:03:10 +02:00
mmap.h Add missing header #includes to fix 'make checkheaders'. 2008-03-07 20:38:21 +00:00
mplayer.exe.manifest Windows support: add a manifest file 2010-11-02 04:14:20 +02:00
mplayer.rc Update copyright year 2012-01-28 13:49:13 +02:00
numcores.c vd_ffmpeg: set thread count to number of cores on machine by default 2010-12-20 05:53:28 +02:00
numcores.h vd_ffmpeg: set thread count to number of cores on machine by default 2010-12-20 05:53:28 +02:00
osdep.h 1. Move the macros for priority classes for OS/2 from priority.c to osdep.h 2010-03-04 12:55:30 +00:00
priority.c build: cygwin: don't rely on _WIN32 being defined 2011-01-29 04:04:53 +02:00
priority.h cosmetics: Remove pointless empty lines at EOF. 2010-02-20 21:02:49 +00:00
setenv.c cleanup: Silence compilation warnings on MinGW-w64 2012-03-01 00:22:30 +02:00
shmem.c #include corresponding .h files in .c files. 2010-02-16 15:03:03 +00:00
shmem.h Add standard license headers to files. 2009-03-01 13:13:25 +00:00
strsep.c osdep: tweak some #includes 2011-01-31 16:03:10 +02:00
strsep.h Add a proper header for our strsep implementation so strsep will 2010-01-17 15:08:31 +00:00
swab.c Add standard license headers to files. 2009-03-01 13:13:25 +00:00
timer-darwin.c osdep: tweak some #includes 2011-01-31 16:03:10 +02:00
timer-linux.c #include corresponding .h files in .c files. 2010-02-16 15:03:03 +00:00
timer-win2.c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
timer.h Add missing 'void' to parameterless function declarations. 2009-05-04 17:35:26 +00:00
vsscanf.c Add standard license headers to files. 2009-03-01 13:13:25 +00:00