summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-16 20:37:13 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-16 20:37:13 +0200
commit1f126fc60cdfb7eef4d42c1593aaaddda4935a37 (patch)
tree5c0d97c655415f0c0b4837d516205deb544ef44b /libmpcodecs/vf.h
parent43c3a07f5812bfe32b1d65cced7f4d07213e1c72 (diff)
downloadmpv-1f126fc60cdfb7eef4d42c1593aaaddda4935a37.tar.bz2
mpv-1f126fc60cdfb7eef4d42c1593aaaddda4935a37.tar.xz
Avoid misleading error "ASS: cannot add video filter"
When using libass with a VO that has direct EOSD support the vf_ass video filter is unnecessary and is not added automatically, but the code that adds the filter when it is needed produced misleading output messages in this case. The following two messages were printed at MSGL_ERR level, making it look like an error condition: Couldn't open video filter 'ass'. ASS: cannot add video filter Add a version of vf_open_plugin() called vf_open_plugin_noerr() that does not itself print an error message if opening a vf fails and that returns the exact status code returned by the vf open() function. Make vf_ass return a different status code depending on whether there was an actual error or if it determined a filter would be redundant. Use the _noerr function in the code adding the filter to avoid the first message and check the status code to avoid the second.
Diffstat (limited to 'libmpcodecs/vf.h')
-rw-r--r--libmpcodecs/vf.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index f9dbb8b4fb..1af0ecca4f 100644
--- a/libmpcodecs/vf.h
+++ b/libmpcodecs/vf.h
@@ -107,6 +107,10 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h);
mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype, int mp_imgflag, int w, int h);
vf_instance_t* vf_open_plugin(struct MPOpts *opts, const vf_info_t* const* filter_list, vf_instance_t* next, const char *name, char **args);
+struct vf_instance *vf_open_plugin_noerr(struct MPOpts *opts,
+ const vf_info_t * const *filter_list,
+ vf_instance_t *next, const char *name,
+ char **args, int *retcode);
vf_instance_t* vf_open_filter(struct MPOpts *opts, vf_instance_t* next, const char *name, char **args);
vf_instance_t* vf_add_before_vo(vf_instance_t **vf, char *name, char **args);
vf_instance_t* vf_open_encoder(struct MPOpts *opts, vf_instance_t* next, const char *name, char *args);