1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-20 23:07:02 +00:00
mpv/sub
wm4 0e81d62c53 Merge branch 'master' into osd_changes
Conflicts:
	libvo/vo_xv.c
2012-10-24 22:38:45 +02:00
..
ass_mp.c options: remove --subfont-autoscale (changes default font scale) 2012-10-24 21:56:35 +02:00
ass_mp.h VO, sub: refactor 2012-10-24 21:56:34 +02:00
dec_sub.c VO, sub: refactor 2012-10-24 21:56:34 +02:00
dec_sub.h VO, sub: refactor 2012-10-24 21:56:34 +02:00
draw_bmp.c options: remove subtitle related options that did nothing 2012-10-24 21:56:35 +02:00
draw_bmp.h sub: add cache to mp_draw_sub_bitmaps() 2012-10-24 21:56:34 +02:00
find_sub.c
find_subfiles.c options: remove subtitle related options that did nothing 2012-10-24 21:56:35 +02:00
find_subfiles.h subs: options: add -sub-paths 2011-04-20 04:22:52 +03:00
img_convert.c Remove things related to old OSD 2012-10-24 21:56:33 +02:00
img_convert.h Remove things related to old OSD 2012-10-24 21:56:33 +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-24 22:38:45 +02:00
sd_ass.c VO, sub: refactor 2012-10-24 21:56:34 +02:00
sd_lavc.c VO, sub: refactor 2012-10-24 21:56:34 +02:00
sd.h VO, sub: refactor 2012-10-24 21:56:34 +02:00
spudec.c options: remove --ffactor switch 2012-10-24 21:56:35 +02:00
spudec.h options: remove --ffactor switch 2012-10-24 21:56:35 +02:00
sub.c options: remove --ffactor switch 2012-10-24 21:56:35 +02:00
sub.h options: remove --ffactor switch 2012-10-24 21:56:35 +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