RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
mpv/osdep
History
wm4 97ac824124 Merge remote-tracking branch 'origin/master' 
Conflicts:
	bstr.c
	bstr.h
	libvo/cocoa_common.m
	libvo/gl_common.c
	libvo/video_out.c
	mplayer.c
	screenshot.c
	sub/subassconvert.c

Merge of cocoa_common.m done by pigoz.

Picking my version of screenshot.c. The fix in commit aadf1002f8 will
be redone in a follow-up commit, as the original commit causes too many
conflicts with the work done locally in this branch, and other work in
progress.
 		2012-04-29 10:01:28 +02:00
..
cocoa_events.h OSX, input: implement wakeup in response to Cocoa events 2012-04-26 21:03:10 +03:00
cocoa_events.m OSX, input: implement wakeup in response to Cocoa events 2012-04-26 21:03:10 +03:00
getch2-win.c input: stop trying to read terminal input on EOF 2012-04-06 14:34:56 +03:00
getch2.c Merge remote-tracking branch 'origin/master' 2012-04-13 17:45:27 +02:00
getch2.h build: remove OS/2 support 2012-04-06 17:45:56 +03:00
gettimeofday.c
…
glob-win.c osdep: tweak some #includes 2011-01-31 16:03:10 +02:00
glob.h
…
io.c win32: use more unicode functions 2012-04-06 23:56:30 +02:00
io.h win32: use more unicode functions 2012-04-06 23:56:30 +02:00
macosx_finder_args.h macosx_finder_args: use cocoa instead of carbon 2012-03-25 22:30:37 +03:00
macosx_finder_args.m macosx_finder_args: use a custom logfile instead of system.log 2012-03-25 22:30:37 +03:00
mmap.h
…
mmap_anon.c
…
mmap_anon.h
…
mplayer.exe.manifest
…
mplayer.rc win32: simplify icon loading 2012-04-14 17:03:11 +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
priority.c build: remove OS/2 support 2012-04-06 17:45:56 +03:00
priority.h
…
setenv.c cleanup: Silence compilation warnings on MinGW-w64 2012-03-01 00:22:30 +02:00
shmem.c
…
shmem.h
…
strsep.c osdep: tweak some #includes 2011-01-31 16:03:10 +02:00
strsep.h
…
swab.c
…
timer-darwin.c osdep: tweak some #includes 2011-01-31 16:03:10 +02:00
timer-linux.c
…
timer-win2.c
…
timer.h
…
vsscanf.c
…