diff options
| author | wm4 <wm4@nowhere> | 2013-03-17 22:12:16 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-03-17 22:12:16 +0100 |
| commit | 79d35b8f012a589207e2478394bd6f91928d1349 (patch) | |
| tree | 40f841ac4a7130d323f3b1bc72ada1d12c9e0bde | |
| parent | f86deec58be9bfbaf9bfa32660db7e6394962064 (diff) | |
| download | mpv-79d35b8f012a589207e2478394bd6f91928d1349.tar.bz2 mpv-79d35b8f012a589207e2478394bd6f91928d1349.tar.xz | |
video: enable panscan calculations even in windowed mode
This was probably enabled to guarantee that panscan is always reset in
windowed mode. However, the window size should be exactly the video size
in windowed mode, unless in cases where the user forcibly changed the
window size (e.g. --geometry). In the former case, panscan will have no
influence at all, and in the latter case we want it to have influence.
| -rw-r--r-- | video/out/aspect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/aspect.c b/video/out/aspect.c index 10bf40c69f..f85b75778b 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -104,7 +104,6 @@ void aspect_calc_panscan(struct vo *vo, int *out_w, int *out_h) } else vo_panscan_area = -opts->panscanrange * vo->dheight; - float panscan_amount = opts->fs ? opts->panscan : 0; - *out_w = fwidth + vo_panscan_area * panscan_amount * vo->aspdat.asp; - *out_h = fheight + vo_panscan_area * panscan_amount; + *out_w = fwidth + vo_panscan_area * opts->panscan * vo->aspdat.asp; + *out_h = fheight + vo_panscan_area * opts->panscan; } |