diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:49:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:50:21 +0200 |
| commit | 7f2198a2f1cf24c8df6709058f9e6f3d69c44f7a (patch) | |
| tree | 21e37dc9c4d1225b3f006982e274019d9b5d41c7 /libavfilter/avfilter.c | |
| parent | ae6634da8b81021c15db3048c185a874b2b96505 (diff) | |
| parent | 73d5d405d424c06f3f354337cfdb24794932094d (diff) | |
Merge commit '73d5d405d424c06f3f354337cfdb24794932094d'
* commit '73d5d405d424c06f3f354337cfdb24794932094d':
split: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6e88161277..23006445c2 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -662,6 +662,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "amix" ) || !strcmp(filter->filter->name, "apad" ) || !strcmp(filter->filter->name, "aphaser" ) || + !strcmp(filter->filter->name, "asplit" ) || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "asyncts" ) || !strcmp(filter->filter->name, "bandpass" ) || @@ -725,6 +726,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || !strcmp(filter->filter->name, "smartblur") || + !strcmp(filter->filter->name, "split" ) || !strcmp(filter->filter->name, "stereo3d" ) || !strcmp(filter->filter->name, "subtitles") || !strcmp(filter->filter->name, "thumbnail") || |