diff options
author | wm4 <wm4@nowhere> | 2013-12-07 19:32:03 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-07 19:32:03 +0100 |
commit | 75d3bf4711f88a79af5fd3246a9503dbd6e01586 (patch) | |
tree | c1515f59f2d8fe1e4bab88a891fae97e8a8b3262 /video/filter/vf_noise.c | |
parent | 6025abffda964b07d04ff2806527d85d956e28ba (diff) | |
download | mpv-75d3bf4711f88a79af5fd3246a9503dbd6e01586.tar.bz2 mpv-75d3bf4711f88a79af5fd3246a9503dbd6e01586.tar.xz |
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.
Diffstat (limited to 'video/filter/vf_noise.c')
-rw-r--r-- | video/filter/vf_noise.c | 17 |
1 files changed, 1 insertions, 16 deletions
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; |