summaryrefslogtreecommitdiffstats
path: root/sub/osd.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-15 15:04:49 +0100
committerwm4 <wm4@nowhere>2013-12-15 15:04:49 +0100
commit78b5324eeefc2b8a235a8ea412283491ee009a1e (patch)
tree781e871012c9ba25010323142d39b1ea9845b292 /sub/osd.h
parent319405830996b2bc73e9cdf437e389f2045adafe (diff)
downloadmpv-78b5324eeefc2b8a235a8ea412283491ee009a1e.tar.bz2
mpv-78b5324eeefc2b8a235a8ea412283491ee009a1e.tar.xz
osd: use separate ASS_Renderer for each OSD object
This simplifies things, although it is slightly less efficient (probably uses a bit more memory). This also happens to fix that the OSC dropped the libass cache on every frame.
Diffstat (limited to 'sub/osd.h')
-rw-r--r--sub/osd.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/sub/osd.h b/sub/osd.h
index 7f8a2f2141..d869700a92 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -115,8 +115,10 @@ struct osd_object {
struct mp_osd_res vo_res;
// Internally used by osd_libass.c
- struct ass_track *osd_track;
struct sub_bitmap *parts_cache;
+ struct ass_track *osd_track;
+ struct ass_renderer *osd_render;
+ struct ass_library *osd_ass_library;
};
struct osd_state {
@@ -155,10 +157,6 @@ struct osd_state {
// Internal to sub.c
struct mp_draw_sub_cache *draw_cache;
-
- // Internally used by osd_libass.c
- struct ass_renderer *osd_render;
- struct ass_library *osd_ass_library;
};
// Start of OSD symbols in osd_font.pfb