Uoti Urpala 89a5714893 subs: always use sub decoder framework for libass rendering ... Remove subtitle selection code setting osd->ass_track directly and vf_ass/vf_vo code rendering the track directly with libass. Instead, do track selection and rendering with dec_sub.c functions. Before, mpctx->set_of_ass_tracks[] contained bare libass tracks generated from external subtitle files. For use with dec_sub.c, it now contains struct sh_sub instances with decoder already initialized. This commit breaks the sub_step command ('g' and 'y' keys) for libass-rendered subtitles. It could be fixed, but it's so useless - especially as with the existing implementation there's no practical way to get subtitle delay back to normal after using it - that I didn't bother. Conflicts: command.c mp_core.h mplayer.c		2012-09-18 21:04:46 +02:00
..
ass_mp.c	subs: libass: use a single persistent renderer for subtitles	2012-09-18 21:04:46 +02:00
ass_mp.h	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +02:00
dec_sub.c	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +02:00
dec_sub.h	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +02:00
find_sub.c
find_subfiles.c	sub: silence output of subtitle search message	2012-07-30 01:45:07 +02:00
find_subfiles.h
osd_dummy.c	Remove teletext support	2012-08-03 00:12:46 +02:00
osd_font.pfb	osd: osd_font.h -> osd_font.pfb	2012-07-28 23:36:08 +02:00
osd_libass.c	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +02:00
sd_ass.c	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +02:00
sd_lavc.c	sd_lavc: use subtitle framework for former av_sub.c code	2012-09-18 21:04:46 +02:00
sd.h	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +02:00
spudec.c	Adjust ffmpeg/libav #includes to work with recent upstream changes	2012-08-21 18:22:00 +02:00
spudec.h	VO: remove old VO glue	2012-08-07 01:29:56 +02:00
sub.c	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +02:00
sub.h	subs: always use sub decoder framework for libass rendering	2012-09-18 21:04:46 +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