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. --- core/cfg-mplayer.h | 1 - 1 file changed, 1 deletion(-) (limited to 'core/cfg-mplayer.h') diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 1a666c6666..8346e31c92 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -480,7 +480,6 @@ const m_option_t common_opts[] = { // scaling: {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL}, {"ssf", (void *) scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - OPT_MAKE_FLAGS("zoom", softzoom, 0), OPT_FLOATRANGE("aspect", movie_aspect, 0, 0.1, 10.0), OPT_FLAG_CONSTANTS("no-aspect", movie_aspect, 0, 0, 0), OPT_FLOATRANGE("xy", screen_size_xy, 0, 0.001, 4096), -- cgit v1.2.3