From 3b8e457379586b3400ede0b3ca96baa15aa1ab06 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 11 Jan 2014 18:26:19 +0100 Subject: 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. --- video/out/aspect.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'video') 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; -- cgit v1.2.3