From fb563de2550858f9ae6cdb239d44a415e5e91135 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 7 Aug 2012 19:21:46 +0200 Subject: sub: fix confusion of ass_library handles Commit 7484ae8e2ee5327 attempted to introduce two ass_library handles (as it was needed to deal with how ass_library manages fonts), but the commit was completely bogus: it assumed osd_state->ass_library would be used by osd_libass.c only, which is not the case. As result, some of the subtitle code used the wrong ass_library handle. We need two ass_library handles in osd_state. The one from the mplayer core for subtitles (osd_state->ass_library), and one for OSD rendering (osd_state->osd_ass_library). --- mplayer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index a7b76b63cd..f99b645494 100644 --- a/mplayer.c +++ b/mplayer.c @@ -4286,7 +4286,7 @@ int main(int argc, char *argv[]) mpctx->ass_library = mp_ass_init(opts); #endif - mpctx->osd = osd_create(opts); + mpctx->osd = osd_create(opts, mpctx->ass_library); init_input(mpctx); -- cgit v1.2.3