diff options
| author | wm4 <wm4@nowhere> | 2013-01-23 10:56:11 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-23 10:56:11 +0100 |
| commit | 4c56baba4048f8a881253d4fe2f49c2715c77376 (patch) | |
| tree | d75891df8cd30c404072f9b67b6da21188b79ba8 /video/out/aspect.c | |
| parent | f2dcdca0c2dc5f904323659b65b29a2b6f00fd88 (diff) | |
| download | mpv-4c56baba4048f8a881253d4fe2f49c2715c77376.tar.bz2 mpv-4c56baba4048f8a881253d4fe2f49c2715c77376.tar.xz | |
options: move -geometry parsing to m_option.c
This also means the option is verified on program start, not when the VO
is created. The actual code becomes a bit more complex, because the
screen width/height is not available at program start.
The actual parsing code is still the same, with its unusual sscanf()
usage.
Diffstat (limited to 'video/out/aspect.c')
| -rw-r--r-- | video/out/aspect.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/video/out/aspect.c b/video/out/aspect.c index 454f865d37..05e40a73e9 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -18,7 +18,6 @@ /* Stuff for correct aspect scaling. */ #include "aspect.h" -#include "geometry.h" #include "vo.h" #include "core/mp_msg.h" #include "core/options.h" @@ -102,7 +101,7 @@ void aspect(struct vo *vo, int *srcw, int *srch, int zoom) int fitw; int fith; get_max_dims(vo, &fitw, &fith, zoom); - if (!zoom && geometry_wh_changed) { + if (!zoom && vo->opts->vo_geometry.wh_valid) { mp_msg(MSGT_VO, MSGL_DBG2, "aspect(0) no aspect forced!\n"); return; // the user doesn't want to fix aspect } |