diff options
| author | wm4 <wm4@nowhere> | 2012-10-04 02:29:54 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-16 07:26:31 +0200 |
| commit | 637f1a4dc6ebcbff1b899da3dbc4b8fa2b12f47c (patch) | |
| tree | e251eb77fb108141fe964a0ac88bd41df69bafa9 /libvo/gl_osd.c | |
| parent | cadff3eec75bdd81fb0d18cd0ac029faa3c318d2 (diff) | |
| download | mpv-637f1a4dc6ebcbff1b899da3dbc4b8fa2b12f47c.tar.bz2 mpv-637f1a4dc6ebcbff1b899da3dbc4b8fa2b12f47c.tar.xz | |
vo_gl: use gl_osd.c
Side effect: no direct support for old OSD format anymore. Instead,
sub.c converts sub-images in that format to the packed, alpha-inverted
version.
osd-color suboption is broken.
Diffstat (limited to 'libvo/gl_osd.c')
| -rw-r--r-- | libvo/gl_osd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvo/gl_osd.c b/libvo/gl_osd.c index 0e99d13652..ce4bee5c03 100644 --- a/libvo/gl_osd.c +++ b/libvo/gl_osd.c @@ -159,7 +159,8 @@ static bool upload_osd(struct mpgl_osd *ctx, struct mpgl_osd_part *osd, { GL *gl = ctx->gl; - osd->packer->padding = imgs->scaled; // assume 2x2 filter on scaling + // assume 2x2 filter on scaling + osd->packer->padding = ctx->scaled || imgs->scaled; int r = packer_pack_from_subbitmaps(osd->packer, imgs); if (r < 0) { mp_msg(MSGT_VO, MSGL_ERR, "[gl] EOSD bitmaps do not fit on " |