diff options
| author |  wm4 <wm4@nowhere> | 2015-02-12 11:53:40 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-12 11:53:40 +0100 |
| commit | 5c5e38fc0e3096fe67ac28ee142e719f319961e0 (patch) | |
| tree | 521f48cc55b10a19bc501dc031d728779790cba8 | |
| parent | a17ea73636c62e417fe93ea70bef4eaa2d334881 (diff) | |
vf_lavfi: drop useless option from wrapper filters
Filters which merely wrap libavfilter (for user-compatibility) like
vf_gradfun had a "lavfi-enable" suboption, which could disable
libavfilter usage. Since none of these filters has an internal
implementation anymore, this was completely useless.
| -rw-r--r-- | video/filter/vf_lavfi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index cb4c348552..850280fdc3 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -452,7 +452,6 @@ const vf_info_t vf_info_lavfi = { // The following code is for the old filters wrapper code. struct vf_lw_opts { - int enable; int64_t sws_flags; char **avopts; }; @@ -461,13 +460,11 @@ struct vf_lw_opts { #define OPT_BASE_STRUCT struct vf_lw_opts const struct m_sub_options vf_lw_conf = { .opts = (const m_option_t[]) { - OPT_FLAG("lavfi", enable, 0), OPT_INT64("lavfi-sws-flags", sws_flags, 0), OPT_KEYVALUELIST("lavfi-o", avopts, 0), {0} }, .defaults = &(const struct vf_lw_opts){ - .enable = 1, .sws_flags = SWS_BICUBIC, }, .size = sizeof(struct vf_lw_opts), @@ -493,7 +490,7 @@ int vf_lw_set_graph(struct vf_instance *vf, struct vf_lw_opts *lavfi_opts, { if (!lavfi_opts) lavfi_opts = (struct vf_lw_opts *)vf_lw_conf.defaults; - if (!lavfi_opts->enable || (filter && !have_filter(filter))) + if (filter && !have_filter(filter)) return -1; MP_VERBOSE(vf, "Using libavfilter for '%s'\n", vf->info->name); void *old_priv = vf->priv; |