diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-04 19:49:35 +0300 |
commit | 0e1b7765be878491565cf5e471f22b15e106164c (patch) | |
tree | 422e500c289335182a2a64934dcabf10b95e32dc /libvo/vo_xv.c | |
parent | a9618c1c6fe9424dfaeb1677348e0382d7252554 (diff) | |
parent | dcfd043ea8d0c46929aad78596314d837c290d39 (diff) | |
download | mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.bz2 mpv-0e1b7765be878491565cf5e471f22b15e106164c.tar.xz |
Merge svn changes up to r29644
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 1085f51327..2fe1616eb3 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -805,24 +805,12 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_DRAW_IMAGE: return draw_image(vo, data); case VOCTRL_GET_PANSCAN: - if (!vo->config_ok || !vo_fs) - return VO_FALSE; return VO_TRUE; case VOCTRL_FULLSCREEN: vo_x11_fullscreen(vo); /* indended, fallthrough to update panscan on fullscreen/windowed switch */ case VOCTRL_SET_PANSCAN: - if ((vo_fs && (vo_panscan != vo->panscan_amount)) - || (!vo_fs && vo->panscan_amount)) { - int old_y = vo->panscan_y; - - panscan_calc(vo); - - if (old_y != vo->panscan_y) { - resize(vo); - flip_page(vo); - } - } + resize(vo); return VO_TRUE; case VOCTRL_SET_EQUALIZER: { |