1
mirror of https://github.com/mpv-player/mpv synced 2024-08-24 07:21:49 +02:00
mpv/sub
wm4 4e89851aa1 Merge branch 'master' into osd_changes
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
2012-10-16 07:30:30 +02:00
..
ass_mp.c Merge branch 'master' into osd_changes 2012-10-16 07:30:30 +02:00
ass_mp.h sub: remove logic for disabling hinting on scaled EOSD 2012-10-16 07:26:31 +02:00
dec_sub.c sub: never decode subs to old OSD format 2012-10-16 07:26:32 +02:00
dec_sub.h sub: never decode subs to old OSD format 2012-10-16 07:26:32 +02:00
find_sub.c sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
find_subfiles.c sub: silence output of subtitle search message 2012-07-30 01:45:07 +02:00
find_subfiles.h subs: options: add -sub-paths 2011-04-20 04:22:52 +03:00
img_convert.c sub: switch to premultiplied alpha 2012-10-16 07:26:32 +02:00
img_convert.h sub: never decode subs to old OSD format 2012-10-16 07:26:32 +02:00
osd_dummy.c sub: allow rendering OSD in ASS image format directly, simplify 2012-10-16 07:26:30 +02:00
osd_font.pfb osd: osd_font.h -> osd_font.pfb 2012-07-28 23:36:08 +02:00
osd_libass.c Merge branch 'master' into osd_changes 2012-10-16 07:30:30 +02:00
sd_ass.c Merge branch 'master' into osd_changes 2012-10-16 07:30:30 +02:00
sd_lavc.c sub: fix and simplify some change detection details 2012-10-16 07:26:45 +02:00
sd.h sub: cleanup: don't pass parameters via global variables 2012-10-16 07:26:32 +02:00
spudec.c sub: fix and simplify some change detection details 2012-10-16 07:26:45 +02:00
spudec.h sub: never decode subs to old OSD format 2012-10-16 07:26:32 +02:00
sub.c sub: fix and simplify some change detection details 2012-10-16 07:26:45 +02:00
sub.h sub: switch to premultiplied alpha 2012-10-16 07:26:32 +02:00
subassconvert.c subassconvert: order colour names alphabetically / better match W3 list 2012-08-03 03:47:09 +02:00
subassconvert.h
subreader.c sub: simplify code by always defining sub_cp 2012-08-03 06:53:10 +02:00
subreader.h Remove dead code 2012-08-01 17:07:35 +02:00
vobsub.c Remove dead code 2012-08-01 17:07:35 +02:00
vobsub.h Remove dead code 2012-08-01 17:07:35 +02:00