diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:10:59 +0200 |
| commit | 6a2fb5b90cb77bbcd33102b6cfa76a786152c1c3 (patch) | |
| tree | 01b5badc0c32d180a63b8b81553cef40407f6884 /libavfilter/avfilter.c | |
| parent | 8695d9de4704aa328b6dd0e9826c04da44d04046 (diff) | |
| parent | ffea3b00c39caa8ad78456ae08c8353929974dfd (diff) | |
Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'
* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd':
vf_settb: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/f_settb.c
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 904164fb1c..71d5e9cc4e 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -691,6 +691,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "aperms") || !strcmp(filter->filter->name, "resample") || !strcmp(filter->filter->name, "setpts" ) || + !strcmp(filter->filter->name, "settb" ) || !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || !strcmp(filter->filter->name, "smartblur") || |