summaryrefslogtreecommitdiffstats
path: root/player/main.c
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/main.c
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/main.c')
-rw-r--r--player/main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/player/main.c b/player/main.c
index ce438636c3..b0a577238d 100644
--- a/player/main.c
+++ b/player/main.c
@@ -222,7 +222,6 @@ void mp_destroy(struct MPContext *mpctx)
pthread_detach(pthread_self());
mp_msg_uninit(mpctx->global);
- pthread_mutex_destroy(&mpctx->ass_lock);
talloc_free(mpctx);
}
@@ -330,8 +329,6 @@ struct MPContext *mp_create(void)
.playback_abort = mp_cancel_new(mpctx),
};
- pthread_mutex_init(&mpctx->ass_lock, NULL);
-
mpctx->global = talloc_zero(mpctx, struct mpv_global);
// Nothing must call mp_msg*() and related before this