From a1ed13869c1586897c323ebf65cfd3975092ffad Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 21 Jan 2015 22:08:24 +0100 Subject: 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). --- video/out/vo_xv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'video/out/vo_xv.c') diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index 07495fb89e..202ba13735 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -48,7 +48,6 @@ #include "talloc.h" #include "common/msg.h" #include "vo.h" -#include "video/vfcap.h" #include "video/mp_image.h" #include "video/img_fourcc.h" #include "x11_common.h" @@ -681,17 +680,16 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) } } -static int query_format(struct vo *vo, uint32_t format) +static int query_format(struct vo *vo, int format) { struct xvctx *ctx = vo->priv; uint32_t i; - int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; int fourcc = find_xv_format(format); if (fourcc) { for (i = 0; i < ctx->formats; i++) { if (ctx->fo[i].id == fourcc) - return flag; + return 1; } } return 0; -- cgit v1.2.3