summaryrefslogtreecommitdiffstats
path: root/player/core.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 /player/core.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 'player/core.h')
-rw-r--r--player/core.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/player/core.h b/player/core.h
index 1d68019c1a..6228732bd9 100644
--- a/player/core.h
+++ b/player/core.h
@@ -365,15 +365,6 @@ typedef struct MPContext {
int last_chapter_seek;
double last_chapter_pts;
- /* Subtitle renderer. This is separate, because we want to keep fonts
- * loaded across ordered chapters, instead of reloading and rescanning
- * them on each transition. (Both of these objects contain this state.)
- */
- pthread_mutex_t ass_lock;
- struct ass_renderer *ass_renderer;
- struct ass_library *ass_library;
- struct mp_log *ass_log;
-
int last_dvb_step;
bool paused;
@@ -525,7 +516,6 @@ void uninit_sub(struct MPContext *mpctx, int order);
void uninit_sub_all(struct MPContext *mpctx);
void update_osd_msg(struct MPContext *mpctx);
void update_subtitles(struct MPContext *mpctx);
-void uninit_sub_renderer(struct MPContext *mpctx);
// video.c
void reset_video_state(struct MPContext *mpctx);