From 53ee9aa6aedbd809ea98eb66078b13008d6f26ed Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 15 Nov 2012 15:03:40 +0100 Subject: options, vo_x11: remove -zoom option, make it default The -zoom option enabled scaling with vo_x11. Remove the -zoom option, and make its behavior default. Since vo_x11 has to use libswscale for colorspace conversion anyway, which doesn't do actual extra scaling when vo_x11 is run in windowed mode, there should be no speed difference with this change. The code removed from vf_scale attempted to scale the video to d_width/ d_height, which matters for anamorphic video and the --xy option only. vo_x11 can handle these natively. The only case for which the removed vf_scale code could matter is encoding with vo_lavc, but since that didn't set VOFLAG_SWSCALE, nothing actually changes. --- video/decode/vd.c | 1 - 1 file changed, 1 deletion(-) (limited to 'video/decode/vd.c') diff --git a/video/decode/vd.c b/video/decode/vd.c index 31b40e46da..6112c48d33 100644 --- a/video/decode/vd.c +++ b/video/decode/vd.c @@ -216,7 +216,6 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, vocfg_flags = (opts->fullscreen ? VOFLAG_FULLSCREEN : 0) | (opts->vidmode ? VOFLAG_MODESWITCHING : 0) - | (opts->softzoom ? VOFLAG_SWSCALE : 0) | (opts->flip ? VOFLAG_FLIPPING : 0); // Time to config libvo! -- cgit v1.2.3