diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:14:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:18:18 +0200 |
| commit | ab6091f8e21df7280f2b50fd6226bbc130fb060a (patch) | |
| tree | c4fbd5b558abb6993e5aeb9b6dd3eeca095c86f7 /libavfilter/avfilter.c | |
| parent | 8ac7090c233c0677e59ee5cf7a5817e02c9ec914 (diff) | |
| parent | 7536c671040f1f3ebc9f0d3b7831dac71436b775 (diff) | |
Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
* commit '7536c671040f1f3ebc9f0d3b7831dac71436b775':
vf_yadif: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_yadif.c
libavfilter/yadif.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 916d661ac7..8fe2389c80 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -714,6 +714,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "unsharp" ) || // !strcmp(filter->filter->name, "scale" ) || !strcmp(filter->filter->name, "select") || + !strcmp(filter->filter->name, "yadif" ) || 0 ; |