summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-07 19:21:46 +0200
committerwm4 <wm4@nowhere>2012-08-07 19:21:46 +0200
commitfb563de2550858f9ae6cdb239d44a415e5e91135 (patch)
tree53d87a7af290a1a40b33d70c060d4137114fd0d2 /mplayer.c
parent762ef8d53238160d5fc8873c249d11d38399bf94 (diff)
downloadmpv-fb563de2550858f9ae6cdb239d44a415e5e91135.tar.bz2
mpv-fb563de2550858f9ae6cdb239d44a415e5e91135.tar.xz
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).
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c2
1 files changed, 1 insertions, 1 deletions
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);