summaryrefslogtreecommitdiffstats
path: root/sub/sd.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/sd.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/sd.h')
-rw-r--r--sub/sd.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/sub/sd.h b/sub/sd.h
index c73f74e151..e4ec2dd357 100644
--- a/sub/sd.h
+++ b/sub/sd.h
@@ -10,19 +10,16 @@
#define SUB_GAP_KEEP 0.4
struct sd {
+ struct mpv_global *global;
struct mp_log *log;
struct MPOpts *opts;
const struct sd_functions *driver;
void *priv;
+ struct demuxer *demuxer;
struct sh_stream *sh;
double video_fps;
-
- // Shared renderer for ASS - done to avoid reloading embedded fonts.
- struct ass_library *ass_library;
- struct ass_renderer *ass_renderer;
- pthread_mutex_t *ass_lock;
};
struct sd_functions {