summaryrefslogtreecommitdiffstats
path: root/video/filter/vf_delogo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-07 19:32:03 +0100
committerwm4 <wm4@nowhere>2013-12-07 19:32:03 +0100
commit75d3bf4711f88a79af5fd3246a9503dbd6e01586 (patch)
treec1515f59f2d8fe1e4bab88a891fae97e8a8b3262 /video/filter/vf_delogo.c
parent6025abffda964b07d04ff2806527d85d956e28ba (diff)
downloadmpv-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_delogo.c')
-rw-r--r--video/filter/vf_delogo.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c
index afee3119de..3ec6755f03 100644
--- a/video/filter/vf_delogo.c
+++ b/video/filter/vf_delogo.c
@@ -41,7 +41,6 @@
//===========================================================================//
static struct vf_priv_s {
- unsigned int outfmt;
int xoff, yoff, lw, lh, band, show;
char *file;
struct timed_rectangle {
@@ -51,9 +50,7 @@ static struct vf_priv_s {
int cur_timed_rect;
struct vf_lw_opts *lw_opts;
} const vf_priv_dflt = {
- 0,
- 0, 0, 0, 0, 1, 0,
- NULL, NULL, 0, 0,
+ .band = 1,
};
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
@@ -195,16 +192,11 @@ 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;
}
-static const unsigned int fmt_list[]={
- IMGFMT_420P,
- 0
-};
-
static int load_timed_rectangles(struct vf_priv_s *delogo)
{
FILE *f;
@@ -301,13 +293,6 @@ static int vf_open(vf_instance_t *vf){
}
fix_band(vf->priv);
- // check csp:
- vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_420P);
- if(!vf->priv->outfmt)
- {
- return 0; // no csp match :(
- }
-
return 1;
}