From 75d3bf4711f88a79af5fd3246a9503dbd6e01586 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 7 Dec 2013 19:32:03 +0100
Subject: video/filter: remove vf_match_csp()

This function improves automatic filter insertion, but this really
should be done by the generic filter code. Remove vf_match_csp() and all
code using it as preparation for that.

This commit temporarily makes handling of filter insertion worse for
now, but it will be fixed with the following commits.
---
 video/filter/vf_noise.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'video/filter/vf_noise.c')

diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c
index 3160907e19..8525b06dc2 100644
--- a/video/filter/vf_noise.c
+++ b/video/filter/vf_noise.c
@@ -64,7 +64,6 @@ typedef struct FilterParam{
 struct vf_priv_s {
 	FilterParam lumaParam;
 	FilterParam chromaParam;
-	unsigned int outfmt;
         int strength;
         int averaged;
         int pattern;
@@ -364,7 +363,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt){
 	switch(fmt)
 	{
 	case IMGFMT_420P:
-		return vf_next_query_format(vf,vf->priv->outfmt);
+		return vf_next_query_format(vf,IMGFMT_420P);
 	}
 	return 0;
 }
@@ -380,11 +379,6 @@ static void parse(FilterParam *fp, struct vf_priv_s *p){
 	if(fp->strength) initNoise(fp);
 }
 
-static const unsigned int fmt_list[]={
-    IMGFMT_420P,
-    0
-};
-
 static int vf_open(vf_instance_t *vf){
     vf->filter=filter;
     vf->query_format=query_format;
@@ -402,15 +396,6 @@ static int vf_open(vf_instance_t *vf){
     parse(&vf->priv->lumaParam, vf->priv);
     parse(&vf->priv->chromaParam, vf->priv);
 
-    // check csp:
-    vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_420P);
-    if(!vf->priv->outfmt)
-    {
-	uninit(vf);
-        return 0; // no csp match :(
-    }
-
-
 #if HAVE_MMX
     if(gCpuCaps.hasMMX){
         lineNoise= lineNoise_MMX;
-- 
cgit v1.2.3