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/filter/vf_vo.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/filter/vf_vo.c')
| -rw-r--r-- | video/filter/vf_vo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c index 5c4d83c01d..13b55f250d 100644 --- a/video/filter/vf_vo.c +++ b/video/filter/vf_vo.c @@ -51,14 +51,13 @@ static int config(struct vf_instance *vf, } const vo_info_t *info = video_out->driver->info; - mp_msg(MSGT_CPLAYER, MSGL_INFO, "VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n", + mp_msg(MSGT_CPLAYER, MSGL_INFO, "VO: [%s] %dx%d => %dx%d %s %s%s%s\n", info->short_name, width, height, d_width, d_height, vo_format_name(outfmt), (flags & VOFLAG_FULLSCREEN) ? " [fs]" : "", (flags & VOFLAG_MODESWITCHING) ? " [vm]" : "", - (flags & VOFLAG_SWSCALE) ? " [zoom]" : "", (flags & VOFLAG_FLIPPING) ? " [flip]" : ""); mp_msg(MSGT_CPLAYER, MSGL_V, "VO: Description: %s\n", info->name); mp_msg(MSGT_CPLAYER, MSGL_V, "VO: Author: %s\n", info->author); |