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_lavc.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_lavc.c')
-rw-r--r-- | video/out/vo_lavc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 9bb3ebd866..032f58c0f1 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -26,7 +26,6 @@ #include "options/options.h" #include "video/fmt-conversion.h" #include "video/mp_image.h" -#include "video/vfcap.h" #include "talloc.h" #include "vo.h" @@ -191,7 +190,7 @@ error: return -1; } -static int query_format(struct vo *vo, uint32_t format) +static int query_format(struct vo *vo, int format) { enum AVPixelFormat pix_fmt = imgfmt2pixfmt(format); @@ -201,7 +200,7 @@ static int query_format(struct vo *vo, uint32_t format) pthread_mutex_lock(&vo->encode_lavc_ctx->lock); int flags = 0; if (encode_lavc_supports_pixfmt(vo->encode_lavc_ctx, pix_fmt)) - flags = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; + flags = 1; pthread_mutex_unlock(&vo->encode_lavc_ctx->lock); return flags; } |