From f1105528981fc83c5dbf15f1c1d409fb8842a1ea Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 3 Jul 2016 18:33:28 +0200 Subject: 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. --- sub/osd_libass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sub/osd_libass.c') 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; } -- cgit v1.2.3