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/out/vo_image.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'video/out/vo_image.c') diff --git a/video/out/vo_image.c b/video/out/vo_image.c index 7b7c367ad4..76adf5a665 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -130,8 +130,7 @@ static int query_format(struct vo *vo, uint32_t fmt) // always wants RGB (at least for now), but it probably doesn't matter // whether we or screenshot.c do the conversion. if (av_format != PIX_FMT_NONE && sws_isSupportedInput(av_format)) - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | - VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; + return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; return 0; } -- cgit v1.2.3