summaryrefslogtreecommitdiffstats
path: root/sub/dec_sub.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-26 18:34:18 +0100
committerwm4 <wm4@nowhere>2015-12-26 18:34:18 +0100
commit8d4a179c144cb3e36762b2c3cef55d1d3bb9f951 (patch)
tree324adbf40a378eff49bad45dfdc56dbf2bf4972c /sub/dec_sub.h
parentce8524cb479f3b3339c6d2b3e0f5a45051145204 (diff)
downloadmpv-8d4a179c144cb3e36762b2c3cef55d1d3bb9f951.tar.bz2
mpv-8d4a179c144cb3e36762b2c3cef55d1d3bb9f951.tar.xz
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.)
Diffstat (limited to 'sub/dec_sub.h')
-rw-r--r--sub/dec_sub.h7
1 files changed, 2 insertions, 5 deletions
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 <stdbool.h>
#include <stdint.h>
-#include <pthread.h>
#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);