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_x11.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_x11.c')
| -rw-r--r-- | video/out/vo_x11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index f819a71a30..97a44337e8 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -269,7 +269,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, int vm = flags & VOFLAG_MODESWITCHING; #endif p->Flip_Flag = flags & VOFLAG_FLIPPING; - p->zoomFlag = flags & VOFLAG_SWSCALE; + p->zoomFlag = 1; p->old_vo_dwidth = -1; p->old_vo_dheight = -1; @@ -507,10 +507,10 @@ static int query_format(struct vo *vo, uint32_t format) return 0; // TODO 8bpp not yet fully implemented if (IMGFMT_BGR_DEPTH(format) == vo->x11->depthonscreen) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | - VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | + VFCAP_OSD | VFCAP_FLIP | VFCAP_ACCEPT_STRIDE; else - return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | + return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_FLIP | VFCAP_ACCEPT_STRIDE; } @@ -519,7 +519,7 @@ static int query_format(struct vo *vo, uint32_t format) case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_YV12: - return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | + return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; } return 0; |