diff options
| author | wm4 <wm4@nowhere> | 2012-10-19 19:11:08 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 21:56:33 +0200 |
| commit | 97c6425140aecc3910a622fb0ad7d79916cfebbe (patch) | |
| tree | ff88672104e0533839e28bfcb9e8e0f4420f4e89 /libvo/vo_x11.c | |
| parent | 98f74335d509320f19db2da8786273f95cad2a69 (diff) | |
| download | mpv-97c6425140aecc3910a622fb0ad7d79916cfebbe.tar.bz2 mpv-97c6425140aecc3910a622fb0ad7d79916cfebbe.tar.xz | |
sub, vf_ass: allow rendering RGBA subs, replace old vf_ass rendering
Do this by replacing all the old vf_ass drawing code by draw_bmp.c.
Change sub.c to always use osd_draw() for the other OSD drawing
routines, and simplify the code a bit.
spudec.c subtitles (i.e. DVD subs) are now considered subtitles, and
are rendered by vf_ass, if that filter is inserted.
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 6ea95527f3..61066a2ec6 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -453,7 +453,7 @@ static void draw_osd(struct vo *vo, struct osd_state *osd) }, }; - osd_draw_on_image(osd, &img, &csp, &subparams); + osd_draw_on_image(osd, &subparams, 0, &img, &csp); } static void flip_page(struct vo *vo) |