path: root/core
diff options
authorwm4 <wm4@nowhere>2012-11-15 15:03:40 +0100
committerwm4 <wm4@nowhere>2012-11-16 21:21:14 +0100
commit53ee9aa6aedbd809ea98eb66078b13008d6f26ed (patch)
tree337eb5accfe21be17b247944835b9b85acfc487d /core
parent52fe0a4fe2bec8a3b4e7a8b5b6fa667504bced12 (diff)
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.
Diffstat (limited to 'core')
2 files changed, 0 insertions, 2 deletions
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),
diff --git a/core/options.h b/core/options.h
index ade419d74e..31d2726c19 100644
--- a/core/options.h
+++ b/core/options.h
@@ -95,7 +95,6 @@ typedef struct MPOpts {
float playback_speed;
float drc_level;
struct m_obj_settings *vf_settings;
- int softzoom;
float movie_aspect;
float screen_size_xy;
int flip;