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/filter/vf_lavfi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/filter/vf_lavfi.c') diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index da455f1c09..a356229a30 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -268,7 +268,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt) // allow us to do anything more sophisticated. // This breaks with filters which accept input pixel formats not // supported by libswscale. - return mp_sws_supported_format(fmt) ? VFCAP_CSP_SUPPORTED : 0; + return !!mp_sws_supported_format(fmt); } static AVFrame *mp_to_av(struct vf_instance *vf, struct mp_image *img) -- cgit v1.2.3