From 79d35b8f012a589207e2478394bd6f91928d1349 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 17 Mar 2013 22:12:16 +0100 Subject: 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. --- video/out/aspect.c | 5 ++--- 1 file 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; } -- cgit v1.2.3