mirror of
https://github.com/mpv-player/mpv
synced 2024-09-12 23:45:53 +02:00
4e89851aa1
Conflicts: Makefile command.c libvo/gl_common.c libvo/vo_corevideo.m libvo/vo_opengl.c libvo/vo_opengl_old.c libvo/vo_opengl_shaders.glsl sub/ass_mp.c sub/osd_libass.c sub/sd_ass.c |
||
---|---|---|
.. | ||
af.rst | ||
ao.rst | ||
changes.rst | ||
encode.rst | ||
input.rst | ||
mpv.rst | ||
options.rst | ||
vf.rst | ||
vo.rst |