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	…
img_convert.c	…
img_convert.h	…
osd_dummy.c	…
osd_font.pfb	…
osd_libass.c	Merge branch 'master' into osd_changes	2012-10-24 22:38:45 +02:00
sd.h	VO, sub: refactor	2012-10-24 21:56:34 +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
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.h	…
subreader.c	…
subreader.h	…
vobsub.c	…
vobsub.h	…