mirror of
https://github.com/mpv-player/mpv
synced 2024-12-23 07:12:39 +00:00
97ac824124
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
|
||
---|---|---|
.. | ||
appleir.c | ||
ar.c | ||
ar.h | ||
input.c | ||
input.h | ||
joystick.c | ||
joystick.h | ||
keycodes.h | ||
lirc.c | ||
lirc.h |