diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:54:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:54:10 +0200 |
| commit | a87e85fa722e34639fe53d64586faa309f51afcc (patch) | |
| tree | 27aebfe1bf7ea3f888b904508ccc38f57fa09464 /libavfilter/avfilter.c | |
| parent | 0724b4a16d6b88b311610e96c7ba341a4b33965d (diff) | |
| parent | 77add967a5e5dae8f322578580c440cb990624ab (diff) | |
| download | ffmpeg-a87e85fa722e34639fe53d64586faa309f51afcc.tar.gz | |
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
* ubitux/shorthand-cleanup:
lavfi/setfield: switch to an AVOptions-based system.
lavfi/asettb: switch to an AVOptions-based system.
lavfi/aselect: switch to an AVOptions-based system.
lavfi/sine: switch to an AVOptions-based system.
lavfi/deshake: switch to an AVOptions-based system.
lavfi/tinterlace: switch to an AVOptions-based system.
lavfi/tile: switch to an AVOptions-based system.
lavfi/concat: 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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index e958923ff2..7c2abdcdbf 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -697,11 +697,13 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "channelsplit") || !strcmp(filter->filter->name, "color" ) || !strcmp(filter->filter->name, "colormatrix") || + !strcmp(filter->filter->name, "concat" ) || !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || !strcmp(filter->filter->name, "curves" ) || !strcmp(filter->filter->name, "decimate" ) || !strcmp(filter->filter->name, "delogo" ) || + !strcmp(filter->filter->name, "deshake" ) || !strcmp(filter->filter->name, "drawbox" ) || !strcmp(filter->filter->name, "drawtext" ) || !strcmp(filter->filter->name, "ebur128" ) || @@ -748,19 +750,25 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "rgbtestsrc") || !strcmp(filter->filter->name, "setpts" ) || !strcmp(filter->filter->name, "settb" ) || + !strcmp(filter->filter->name, "asettb" ) || + !strcmp(filter->filter->name, "setfield") || !strcmp(filter->filter->name, "showspectrum") || !strcmp(filter->filter->name, "silencedetect") || + !strcmp(filter->filter->name, "sine" ) || !strcmp(filter->filter->name, "smartblur") || !strcmp(filter->filter->name, "split" ) || !strcmp(filter->filter->name, "stereo3d" ) || !strcmp(filter->filter->name, "subtitles") || !strcmp(filter->filter->name, "testsrc" ) || !strcmp(filter->filter->name, "thumbnail") || + !strcmp(filter->filter->name, "tile") || + !strcmp(filter->filter->name, "tinterlace") || !strcmp(filter->filter->name, "transpose") || !strcmp(filter->filter->name, "treble" ) || !strcmp(filter->filter->name, "unsharp" ) || // !strcmp(filter->filter->name, "scale" ) || !strcmp(filter->filter->name, "select") || + !strcmp(filter->filter->name, "aselect" ) || !strcmp(filter->filter->name, "volume" ) || !strcmp(filter->filter->name, "yadif" ) || 0 |