diff options
| author | wm4 <wm4@nowhere> | 2014-01-11 18:26:19 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-01-11 18:58:06 +0100 |
| commit | 3b8e457379586b3400ede0b3ca96baa15aa1ab06 (patch) | |
| tree | ddac485326d999ff0574b9a3dc38035aa7110556 /video | |
| parent | 6a3ab66427cd90e3cb558b0e7b072dd059fc23f3 (diff) | |
| download | mpv-3b8e457379586b3400ede0b3ca96baa15aa1ab06.tar.bz2 mpv-3b8e457379586b3400ede0b3ca96baa15aa1ab06.tar.xz | |
video/out: remove fallback handling for screensize/monitor pixel aspect
When using --monitoraspect, but either the screen width or height or
both are unknown, a fallback is applied. This is a completely useless
obscure corner case that's going to help nobody, so get it out of the
way.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/aspect.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/video/out/aspect.c b/video/out/aspect.c index e7167dacde..0e2e926c0f 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -39,13 +39,7 @@ void aspect_save_screenres(struct vo *vo, int scrw, int scrh) { MP_DBG(vo, "aspect_save_screenres %dx%d\n", scrw, scrh); struct mp_vo_opts *opts = vo->opts; - if (scrw <= 0 && scrh <= 0) - scrw = 1024; - if (scrh <= 0) - scrh = (scrw * 3 + 3) / 4; - if (scrw <= 0) - scrw = (scrh * 4 + 2) / 3; - if (opts->force_monitor_aspect) + if (scrw > 0 && scrh > 0 && opts->force_monitor_aspect) vo->aspdat.monitor_par = opts->force_monitor_aspect * scrh / scrw; else vo->aspdat.monitor_par = 1.0 / opts->monitor_pixel_aspect; |