wm4 84829a4ea1 Merge branch 'osd_changes' into master ...

Conflicts:
	DOCS/man/en/options.rst

2012-11-01 02:12:47 +01: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

draw_bmp: remove swscale bug workaround

2012-11-01 02:07:46 +01:00

draw_bmp.h

screenshot, draw_bmp: use colorspace passed with mp_image

2012-11-01 02:07:45 +01:00

find_sub.c

sub/OSD: move some related files to sub/

2011-01-26 20:39:05 +02:00

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

Merge branch 'osd_changes' into master

2012-11-01 02:12:47 +01:00

spudec.h

options: remove --ffactor switch

2012-10-24 21:56:35 +02:00

sub.c

screenshot, draw_bmp: use colorspace passed with mp_image

2012-11-01 02:07:45 +01:00

sub.h

screenshot, draw_bmp: use colorspace passed with mp_image

2012-11-01 02:07:45 +01:00

subassconvert.c

subassconvert: order colour names alphabetically / better match W3 list

2012-08-03 03:47:09 +02:00

subassconvert.h

…

subreader.c

subreader: do not write outside array bounds

2012-10-31 22:45:38 +01: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