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).

1 files changed, 2 insertions, 1 deletions

diff --git a/sub/sub.c b/sub/sub.c
index 056d03d1e5..52c79c1d40 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -304,11 +304,12 @@ int osd_update(struct osd_state *osd, int dxs, int dys)
     return osd_update_ext(osd, dxs, dys, 0, 0, 0, 0, dxs, dys);
 }
 
-struct osd_state *osd_create(struct MPOpts *opts)
+struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
 {
     struct osd_state *osd = talloc_zero(NULL, struct osd_state);
     *osd = (struct osd_state){
         .opts = opts,
+        .ass_library = asslib,
     };
     if(!draw_alpha_init_flag){
 	draw_alpha_init_flag=1;