diff options
author | wm4 <wm4@nowhere> | 2015-01-21 22:08:24 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-01-21 22:08:24 +0100 |
commit | a1ed13869c1586897c323ebf65cfd3975092ffad (patch) | |
tree | da92c9384cc192111ca54784713c4e9307dc9cef /video/out/vo_vaapi.c | |
parent | 2a691d1ede42e8466f1f880c390659d1f0145e94 (diff) | |
download | mpv-a1ed13869c1586897c323ebf65cfd3975092ffad.tar.bz2 mpv-a1ed13869c1586897c323ebf65cfd3975092ffad.tar.xz |
video: remove vfcap.h
And remove all uses of the VFCAP_CSP_SUPPORTED* constants. This is
supposed to reduce conversions if many filters are used (with many
incompatible pixel formats), and also for preferring the VO's natively
supported pixel formats (as opposed to conversion).
This is worthless by now. Not only do the main VOs not use software
conversion, but also the way vf_lavfi and libavfilter work mostly break
the way the old MPlayer mechanism worked. Other important filters like
vf_vapoursynth do not support "proper" format negotation either.
Part of this was already removed with the vf_scale cleanup from today.
While I'm touching every single VO, also fix the query_format argument
(it's not a FourCC anymore).
Diffstat (limited to 'video/out/vo_vaapi.c')
-rw-r--r-- | video/out/vo_vaapi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index b51337c7d9..f8edd83b4e 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -37,7 +37,6 @@ #include "sub/img_convert.h" #include "x11_common.h" -#include "video/vfcap.h" #include "video/mp_image.h" #include "video/vaapi.h" #include "video/hwdec.h" @@ -175,11 +174,11 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) return 0; } -static int query_format(struct vo *vo, uint32_t imgfmt) +static int query_format(struct vo *vo, int imgfmt) { struct priv *p = vo->priv; if (imgfmt == IMGFMT_VAAPI || va_image_format_from_imgfmt(p->va_image_formats, imgfmt)) - return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; + return 1; return 0; } |