mirror of https://github.com/mpv-player/mpv
1aa2e36122
Conflicts: bstr.c bstr.h etc/input.conf input/input.c input/input.h libao2/ao_pulse.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c libvo/gl_common.c libvo/x11_common.c mixer.c mixer.h mplayer.c |
||
---|---|---|
.. | ||
appleir.c | ||
ar.c | ||
ar.h | ||
input.c | ||
input.h | ||
joystick.c | ||
joystick.h | ||
keycodes.h | ||
lirc.c | ||
lirc.h |