diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-19 03:23:50 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-19 03:23:50 +0200 |
commit | e46317a1db077a7f92ea5db7bb76e6cc899f1a64 (patch) | |
tree | 077078d79610f76cce2e38217f452a4da2b9287c /libvo/vo_vdpau.c | |
parent | 186e5a998c8424b3c850b62d6f5755a0928cd64c (diff) | |
parent | 908286b437f3b8c8564db3c77456d5350588fb17 (diff) | |
download | mpv-e46317a1db077a7f92ea5db7bb76e6cc899f1a64.tar.bz2 mpv-e46317a1db077a7f92ea5db7bb76e6cc899f1a64.tar.xz |
Merge svn changes up to r28655
Diffstat (limited to 'libvo/vo_vdpau.c')
-rw-r--r-- | libvo/vo_vdpau.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 41dafaa169..1a167ba2c3 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -654,14 +654,16 @@ static uint32_t get_image(mp_image_t *mpi) static int query_format(uint32_t format) { + int default_flags = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD; switch (format) { case IMGFMT_YV12: + return default_flags | VOCAP_NOSLICES; case IMGFMT_VDPAU_MPEG1: case IMGFMT_VDPAU_MPEG2: case IMGFMT_VDPAU_H264: case IMGFMT_VDPAU_WMV3: case IMGFMT_VDPAU_VC1: - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD; + return default_flags; } return 0; } |