From 05cf512dc56aab1aaf12884e44065cf2fc03c11e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 18 Jul 2013 13:57:28 +0200
Subject: vo: remove aspdat.asp member

This was bad, because it was the only aspdat member updated by
vo_get_src_dst_rects() instead of vo_reconfig(). Now it isn't
accessed anymore, so remove it.
---
 video/out/aspect.c | 3 +--
 video/out/vo.h     | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/video/out/aspect.c b/video/out/aspect.c
index 0259c0f3ea..2697d97e97 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -86,7 +86,6 @@ static void aspect_calc(struct vo *vo, int *srcw, int *srch)
                     "[ASPECT] Warning: No suitable new res found!\n");
         }
     }
-    aspdat->asp = *srcw / (float)*srch;
     mp_msg(MSGT_VO, MSGL_DBG2, "aspect(2) wh: %dx%d (org: %dx%d)\n",
            *srcw, *srch, aspdat->prew, aspdat->preh);
 }
@@ -106,6 +105,6 @@ void aspect_calc_panscan(struct vo *vo, int *out_w, int *out_h)
     } else
         vo_panscan_area = -opts->panscanrange * vo->dheight;
 
-    *out_w = fwidth + vo_panscan_area * opts->panscan * vo->aspdat.asp;
+    *out_w = fwidth + vo_panscan_area * opts->panscan * fwidth / fheight;
     *out_h = fheight + vo_panscan_area * opts->panscan;
 }
diff --git a/video/out/vo.h b/video/out/vo.h
index 3eb9f940ea..2e3df65463 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -283,7 +283,6 @@ struct vo {
         int prew; // prescaled width
         int preh; // prescaled height
         float par; // pixel aspect ratio out of orgw/orgh and prew/preh
-        float asp; // final video display aspect
     } aspdat;
 
     char *window_title;
-- 
cgit v1.2.3