diff options
author | wm4 <wm4@nowhere> | 2016-07-03 18:33:28 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-07-03 19:31:56 +0200 |
commit | f1105528981fc83c5dbf15f1c1d409fb8842a1ea (patch) | |
tree | ad955c1e8a313032b2741b70d446a2fcbb41610a /sub/osd_libass.c | |
parent | 315e2e3da8b5a0d5ff75e438c9c4bbbbc6d53b91 (diff) | |
download | mpv-f1105528981fc83c5dbf15f1c1d409fb8842a1ea.tar.bz2 mpv-f1105528981fc83c5dbf15f1c1d409fb8842a1ea.tar.xz |
sub: pass preferred OSD format to subtitle renderers
The intention is to let mp_ass_packer_pack() produce different output
for the RGBA and LIBASS formats. VOs (or whatever generates the OSD)
currently do not signal a preferred format, and this mechanism just
exists to switch between RGBA and LIBASS formats correctly, preferring
LIBASS if the VO supports it.
Diffstat (limited to 'sub/osd_libass.c')
-rw-r--r-- | sub/osd_libass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/osd_libass.c b/sub/osd_libass.c index f940b6117f..a9ab7eabd2 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -525,7 +525,7 @@ static void append_ass(struct ass_state *ass, struct mp_osd_res *res, } void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj, - struct sub_bitmaps *out_imgs) + int format, struct sub_bitmaps *out_imgs) { if (obj->force_redraw && obj->type == OSDTYPE_OSD) update_osd(osd, obj); @@ -542,7 +542,7 @@ void osd_object_get_bitmaps(struct osd_state *osd, struct osd_object *obj, } mp_ass_packer_pack(obj->ass_packer, obj->ass_imgs, obj->num_externals + 1, - obj->changed, SUBBITMAP_LIBASS, out_imgs); + obj->changed, format, out_imgs); obj->changed = false; } |