From 89a57148934ec7f150a6170ac1313f6f5c636596 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 25 Aug 2012 21:22:39 +0300 Subject: 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 --- defaultopts.c | 1 + 1 file changed, 1 insertion(+) (limited to 'defaultopts.c') diff --git a/defaultopts.c b/defaultopts.c index 8636fe69f0..672dbd5f5c 100644 --- a/defaultopts.c +++ b/defaultopts.c @@ -39,6 +39,7 @@ void set_default_mplayer_options(struct MPOpts *opts) .audio_id = -1, .video_id = -1, .sub_id = -1, + .sub_visibility = 1, .extension_parsing = 1, .audio_output_channels = 2, .audio_output_format = -1, // AF_FORMAT_UNKNOWN -- cgit v1.2.3