diff options
| author | wm4 <wm4@nowhere> | 2012-11-15 15:03:40 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-16 21:21:14 +0100 |
| commit | 53ee9aa6aedbd809ea98eb66078b13008d6f26ed (patch) | |
| tree | 337eb5accfe21be17b247944835b9b85acfc487d /video/out/vo_direct3d.c | |
| parent | 52fe0a4fe2bec8a3b4e7a8b5b6fa667504bced12 (diff) | |
| download | mpv-53ee9aa6aedbd809ea98eb66078b13008d6f26ed.tar.bz2 mpv-53ee9aa6aedbd809ea98eb66078b13008d6f26ed.tar.xz | |
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 'video/out/vo_direct3d.c')
| -rw-r--r-- | video/out/vo_direct3d.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 3a70a081bf..6e4e2dbae2 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -1218,8 +1218,7 @@ static int query_format(d3d_priv *priv, uint32_t movie_fmt) if (!init_rendering_mode(priv, movie_fmt, false)) return 0; - int osd_caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW - | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; + int osd_caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; if (!priv->opt_disable_osd) osd_caps |= VFCAP_OSD; return osd_caps; |