summaryrefslogtreecommitdiffstats
path: root/video/out/vo_xv.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-15 15:03:40 +0100
committerwm4 <wm4@nowhere>2012-11-16 21:21:14 +0100
commit53ee9aa6aedbd809ea98eb66078b13008d6f26ed (patch)
tree337eb5accfe21be17b247944835b9b85acfc487d /video/out/vo_xv.c
parent52fe0a4fe2bec8a3b4e7a8b5b6fa667504bced12 (diff)
downloadmpv-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_xv.c')
-rw-r--r--video/out/vo_xv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index 4019583914..d171559f53 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -479,7 +479,7 @@ static uint32_t draw_image(struct vo *vo, mp_image_t *mpi)
static int query_format(struct xvctx *ctx, uint32_t format)
{
uint32_t i;
- int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
+ int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
/* check image formats */
for (i = 0; i < ctx->formats; i++) {