summaryrefslogtreecommitdiffstats
path: root/sub/sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-12-11 16:24:24 +0100
committerRudolf Polzer <divverent@xonotic.org>2012-12-28 08:30:15 +0100
commit844bba6645864ad2ccd9cc40bab2c4553b50d35b (patch)
tree2d50f94b37b807ec5606d408398c360b32a8fedb /sub/sub.c
parentf3374eecada2cde520d76931055f0509296fc9d6 (diff)
downloadmpv-844bba6645864ad2ccd9cc40bab2c4553b50d35b.tar.bz2
mpv-844bba6645864ad2ccd9cc40bab2c4553b50d35b.tar.xz
sub: add ASS to RGBA conversion
This makes implementing new VOs easier, because they don't have to support the ASS format.
Diffstat (limited to 'sub/sub.c')
-rw-r--r--sub/sub.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sub/sub.c b/sub/sub.c
index 56d85141a7..1365d3c844 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -229,6 +229,10 @@ static void render_object(struct osd_state *osd, struct osd_object *obj,
if (out_imgs->format == SUBBITMAP_RGBA && opts->sub_gauss != 0.0f)
cached |= osd_conv_blur_rgba(obj->cache[2], out_imgs, opts->sub_gauss);
+ // Do this conversion last to not trigger gauss blurring for ASS
+ if (formats[SUBBITMAP_RGBA] && out_imgs->format == SUBBITMAP_LIBASS)
+ cached |= osd_conv_ass_to_rgba(obj->cache[3], out_imgs);
+
if (cached)
obj->cached = *out_imgs;
}