diff options
author | wm4 <wm4@nowhere> | 2013-12-15 13:43:26 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-15 13:44:39 +0100 |
commit | 319405830996b2bc73e9cdf437e389f2045adafe (patch) | |
tree | 70095e57e72d584d2a1b97dcf64d423e7a019e9a /mpvcore/player/loadfile.c | |
parent | 4ca740ccf9314f77078e08f1923d86b060643aa5 (diff) | |
download | mpv-319405830996b2bc73e9cdf437e389f2045adafe.tar.bz2 mpv-319405830996b2bc73e9cdf437e389f2045adafe.tar.xz |
player: don't store subtitle renderer in osd_state
This doesn't have much value. It can't be accessed by anything else than
the actual subtitle renderer (sd_ass.c). sd_ass.c could create the
renderer itself, except that we apparently want to save memory (and some
font loading time) when using ordered chapters or multiple subtitle
tracks.
Diffstat (limited to 'mpvcore/player/loadfile.c')
-rw-r--r-- | mpvcore/player/loadfile.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mpvcore/player/loadfile.c b/mpvcore/player/loadfile.c index 33d10ed610..b4e8921089 100644 --- a/mpvcore/player/loadfile.c +++ b/mpvcore/player/loadfile.c @@ -91,9 +91,9 @@ void uninit_player(struct MPContext *mpctx, unsigned int mask) if (mask & INITIALIZED_LIBASS) { mpctx->initialized_flags &= ~INITIALIZED_LIBASS; #if HAVE_LIBASS - if (mpctx->osd->ass_renderer) - ass_renderer_done(mpctx->osd->ass_renderer); - mpctx->osd->ass_renderer = NULL; + if (mpctx->ass_renderer) + ass_renderer_done(mpctx->ass_renderer); + mpctx->ass_renderer = NULL; ass_clear_fonts(mpctx->ass_library); #endif } @@ -847,13 +847,11 @@ static void init_sub_renderer(struct MPContext *mpctx) { #if HAVE_LIBASS assert(!(mpctx->initialized_flags & INITIALIZED_LIBASS)); - assert(!mpctx->osd->ass_renderer); + assert(!mpctx->ass_renderer); - mpctx->osd->ass_renderer = ass_renderer_init(mpctx->osd->ass_library); - if (mpctx->osd->ass_renderer) { - mp_ass_configure_fonts(mpctx->osd->ass_renderer, - mpctx->opts->sub_text_style); - } + mpctx->ass_renderer = ass_renderer_init(mpctx->ass_library); + if (mpctx->ass_renderer) + mp_ass_configure_fonts(mpctx->ass_renderer, mpctx->opts->sub_text_style); mpctx->initialized_flags |= INITIALIZED_LIBASS; #endif } |