RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

vf_lavfi: drop useless option from wrapper filters

Browse Source 
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.
This commit is contained in:
wm4 2015-02-12 11:53:40 +01:00
parent a17ea73636
commit 5c5e38fc0e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
video/filter/vf_lavfi.c
View File

@ -452,7 +452,6 @@ const vf_info_t vf_info_lavfi = {
// The following code is for the old filters wrapper code. // The following code is for the old filters wrapper code.
struct vf_lw_opts { struct vf_lw_opts {
int enable;
int64_t sws_flags; int64_t sws_flags;
char **avopts; char **avopts;
}; };
@ -461,13 +460,11 @@ struct vf_lw_opts {
#define OPT_BASE_STRUCT struct vf_lw_opts #define OPT_BASE_STRUCT struct vf_lw_opts
const struct m_sub_options vf_lw_conf = { const struct m_sub_options vf_lw_conf = {
.opts = (const m_option_t[]) { .opts = (const m_option_t[]) {
OPT_FLAG("lavfi", enable, 0),
OPT_INT64("lavfi-sws-flags", sws_flags, 0), OPT_INT64("lavfi-sws-flags", sws_flags, 0),
OPT_KEYVALUELIST("lavfi-o", avopts, 0), OPT_KEYVALUELIST("lavfi-o", avopts, 0),
{0} {0}
}, },
.defaults = &(const struct vf_lw_opts){ .defaults = &(const struct vf_lw_opts){
.enable = 1,
.sws_flags = SWS_BICUBIC, .sws_flags = SWS_BICUBIC,
}, },
.size = sizeof(struct vf_lw_opts), .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) if (!lavfi_opts)
lavfi_opts = (struct vf_lw_opts *)vf_lw_conf.defaults; 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; return -1;
MP_VERBOSE(vf, "Using libavfilter for '%s'\n", vf->info->name); MP_VERBOSE(vf, "Using libavfilter for '%s'\n", vf->info->name);
void *old_priv = vf->priv; void *old_priv = vf->priv;