summaryrefslogtreecommitdiffstats
path: root/video/out/vo.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-11 18:44:27 +0100
committerwm4 <wm4@nowhere>2014-01-11 18:58:06 +0100
commitd956bbc065d570f425f402c83d69957584591dbd (patch)
treea515ffd2ada6a21d583e00f22079c0e33ff0dc76 /video/out/vo.h
parent3b8e457379586b3400ede0b3ca96baa15aa1ab06 (diff)
downloadmpv-d956bbc065d570f425f402c83d69957584591dbd.tar.bz2
mpv-d956bbc065d570f425f402c83d69957584591dbd.tar.xz
video/out: simplify monitor aspect handling
For some reason, this made all VO backends both set the screen resolution in opts->screenwidth/height, and call aspect_save_screenres(). Remove the latter. Move the code to calculate the PAR-corrected window size from aspect.c to vo.c, and make it so that the monitor PAR is recalculated when it makes sense.
Diffstat (limited to 'video/out/vo.h')
-rw-r--r--video/out/vo.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo.h b/video/out/vo.h
index 2309e905d1..900fc96e28 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -265,12 +265,12 @@ struct vo {
int xinerama_x;
int xinerama_y;
+ float monitor_par;
struct aspect_data {
- float monitor_par; // out of screen size or from options
- int orgw; // real width
+ int orgw; // real width (same as params->w and h)
int orgh; // real height
- int prew; // prescaled width
+ int prew; // prescaled width (same as params->d_w and d_h)
int preh; // prescaled height
float par; // pixel aspect ratio out of orgw/orgh and prew/preh
} aspdat;