diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-02-22 02:07:16 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-02-26 17:11:04 +0200 |
| commit | 5ff421bf5d7e08a2003a333d1db49e7756f4fe2e (patch) | |
| tree | 59e10ca224007fee9a98611cda971db97042b0fa /libvo/vo_vdpau.c | |
| parent | 0a2a78c62e9a8519d5f74538835b85be036b27d7 (diff) | |
| download | mpv-5ff421bf5d7e08a2003a333d1db49e7756f4fe2e.tar.bz2 mpv-5ff421bf5d7e08a2003a333d1db49e7756f4fe2e.tar.xz | |
vo_vdpau: improve VOCTRL_GET_EOSD_RES code
Remove the special case for fullscreen; the same variables should have
the correct values in windowed and fullscreen modes. This fixes libass
subtitle positioning in the (non-typical) case where you have black
bands inside a window. Behavior in fullscreen and in the typical
windowed case without borders should not be affected.
Diffstat (limited to 'libvo/vo_vdpau.c')
| -rw-r--r-- | libvo/vo_vdpau.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 1b34cba642..dfd51a4130 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -1785,16 +1785,10 @@ static int control(struct vo *vo, uint32_t request, void *data) return VO_TRUE; case VOCTRL_GET_EOSD_RES: { mp_eosd_res_t *r = data; - r->mt = r->mb = r->ml = r->mr = 0; - if (vo_fs) { - r->w = vo->opts->vo_screenwidth; - r->h = vo->opts->vo_screenheight; - r->ml = r->mr = vc->border_x; - r->mt = r->mb = vc->border_y; - } else { - r->w = vo->dwidth; - r->h = vo->dheight; - } + r->w = vo->dwidth; + r->h = vo->dheight; + r->ml = r->mr = vc->border_x; + r->mt = r->mb = vc->border_y; return VO_TRUE; } case VOCTRL_REDRAW_OSD: |