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 --- sub/ass_mp.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sub/ass_mp.h') diff --git a/sub/ass_mp.h b/sub/ass_mp.h index 095cf4311d..3cfbe147b7 100644 --- a/sub/ass_mp.h +++ b/sub/ass_mp.h @@ -61,10 +61,4 @@ typedef struct ass_image { #endif -typedef struct { - ASS_Image *imgs; - int changed; -} mp_eosd_images_t; - - #endif /* MPLAYER_ASS_MP_H */ -- cgit v1.2.3