diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:37:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 00:37:32 +0200 |
| commit | b4ffc35e76fc7106902323831248393f33f94c55 (patch) | |
| tree | 1dadb62aba9a96d54c9f50be08558006e010d23f /libavfilter/avfilter.c | |
| parent | a4e0defa75b6f766aa31d80c55688d036b5fd87b (diff) | |
| parent | 4ecee69b20a7ee60fba6cb53ff45d95a015df05b (diff) | |
| download | ffmpeg-b4ffc35e76fc7106902323831248393f33f94c55.tar.gz | |
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
* ubitux/shorthand-cleanup:
lavfi/mptestsrc: switch to an AVOptions-based system.
lavfi/mandelbrot: switch to an AVOptions-based system.
lavfi/life: switch to an AVOptions-based system.
lavfi/cellauto: 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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 226008ee61..935c6fa287 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -660,6 +660,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "boxblur" ) || + !strcmp(filter->filter->name, "cellauto") || !strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || @@ -680,9 +681,12 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "gradfun" ) || !strcmp(filter->filter->name, "hqdn3d" ) || !strcmp(filter->filter->name, "ocv" ) || + !strcmp(filter->filter->name, "life" ) || !strcmp(filter->filter->name, "lut" ) || !strcmp(filter->filter->name, "lutyuv" ) || !strcmp(filter->filter->name, "lutrgb" ) || + !strcmp(filter->filter->name, "mandelbrot" ) || + !strcmp(filter->filter->name, "mptestsrc" ) || !strcmp(filter->filter->name, "negate" ) || !strcmp(filter->filter->name, "overlay" ) || !strcmp(filter->filter->name, "pad" ) || |