From 8d4a179c144cb3e36762b2c3cef55d1d3bb9f951 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 26 Dec 2015 18:34:18 +0100 Subject: sub: always recreate ASS_Renderer on subtitle decoder reinit This includes the case of switching ordered chapter boundaries. It will now be recreated on each timeline part switch. This shouldn't be much of a problem with modern libass. (Older libass versions use fontconfig for memory fonts, and will be very slow to reinitialize memory fonts.) --- sub/dec_sub.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sub/dec_sub.h') diff --git a/sub/dec_sub.h b/sub/dec_sub.h index 40a882c9f0..47386e6ef8 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -3,10 +3,10 @@ #include #include -#include #include "osd.h" +struct demuxer; struct sh_stream; struct ass_track; struct mpv_global; @@ -30,10 +30,7 @@ void sub_lock(struct dec_sub *sub); void sub_unlock(struct dec_sub *sub); void sub_set_video_fps(struct dec_sub *sub, double fps); -void sub_set_ass_renderer(struct dec_sub *sub, struct ass_library *ass_library, - struct ass_renderer *ass_renderer, - pthread_mutex_t *ass_lock); -void sub_init_from_sh(struct dec_sub *sub, struct sh_stream *sh); +void sub_init(struct dec_sub *sub, struct demuxer *demuxer, struct sh_stream *sh); bool sub_is_initialized(struct dec_sub *sub); -- cgit v1.2.3