diff options
author | wm4 <wm4@nowhere> | 2015-02-11 17:32:41 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-02-11 17:35:58 +0100 |
commit | 2522bff5657c7566ac956998bcb32a0c9c3d2667 (patch) | |
tree | 5619032a1a103f1d101868c1843dca23b69ce8fb /video/filter/vf_lavfi.h | |
parent | 73d23a94059e40fd1209912d9365a2fb910eb8b1 (diff) | |
download | mpv-2522bff5657c7566ac956998bcb32a0c9c3d2667.tar.bz2 mpv-2522bff5657c7566ac956998bcb32a0c9c3d2667.tar.xz |
video/filters: simplify libavfilter bridge
Remove the confusing crap that allowed a filter using the libavfilter
bridge to be compiled without libavfilter. Instead, compile the wrappers
only if libavfilter is enabled at compile time.
The only filter which still requires it is vf_stereo3d (unfortunately).
Special-case this one. (The whole filter and how it interacts with lavfi
is pure braindeath anyway.)
Diffstat (limited to 'video/filter/vf_lavfi.h')
-rw-r--r-- | video/filter/vf_lavfi.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/video/filter/vf_lavfi.h b/video/filter/vf_lavfi.h index d28d7e55d6..0b1f49323a 100644 --- a/video/filter/vf_lavfi.h +++ b/video/filter/vf_lavfi.h @@ -1,15 +1,11 @@ #ifndef MP_VF_LAVFI_H_ #define MP_VF_LAVFI_H_ -#include "config.h" - #include "common/common.h" #include "vf.h" struct vf_lw_opts; -#if HAVE_LIBAVFILTER - extern const struct m_sub_options vf_lw_conf; int vf_lw_set_graph(struct vf_instance *vf, struct vf_lw_opts *lavfi_opts, @@ -21,28 +17,5 @@ void vf_lw_set_reconfig_cb(struct vf_instance *vf, int (*reconfig)(struct vf_instance *vf, struct mp_image_params *in, struct mp_image_params *out)); -#else -static inline -int vf_lw_set_graph(struct vf_instance *vf, struct vf_lw_opts *lavfi_opts, - char *filter, char *opts, ...) -{ - return -1; -} -static void *vf_lw_old_priv(struct vf_instance *vf) -{ - return 0; -} -static void vf_lw_update_graph(struct vf_instance *vf, char *filter, char *opts, ...) -{ -} -static void vf_lw_set_reconfig_cb(struct vf_instance *vf, - int (*reconfig)(struct vf_instance *vf, - struct mp_image_params *in, - struct mp_image_params *out)) -{ -} -#include "options/m_option.h" -static const struct m_sub_options vf_lw_conf = {0}; -#endif #endif |