History

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.

Michael Niedermayer committed 13 years ago

Commit b4ffc352 parents a4e0def 4ecee696 files · +8 −35Browse files

Showing the changes to libavfilter/avfilter.c (1 of 6 files). Show all

Unified · Split

libavfilter/avfilter.c+4−0
@@ -660,6 +660,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 659 unmodified lines
660660 !strcmp(filter->filter->name, "ass") ||
661661 !strcmp(filter->filter->name, "blackframe") ||
662662 !strcmp(filter->filter->name, "boxblur" ) ||
663+ !strcmp(filter->filter->name, "cellauto") ||
663664 !strcmp(filter->filter->name, "colormatrix") ||
664665 !strcmp(filter->filter->name, "crop" ) ||
665666 !strcmp(filter->filter->name, "cropdetect") ||
@@ -680,9 +681,12 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 14 unmodified lines
680681 !strcmp(filter->filter->name, "gradfun" ) ||
681682 !strcmp(filter->filter->name, "hqdn3d" ) ||
682683 !strcmp(filter->filter->name, "ocv" ) ||
684+ !strcmp(filter->filter->name, "life" ) ||
683685 !strcmp(filter->filter->name, "lut" ) ||
684686 !strcmp(filter->filter->name, "lutyuv" ) ||
685687 !strcmp(filter->filter->name, "lutrgb" ) ||
688+ !strcmp(filter->filter->name, "mandelbrot" ) ||
689+ !strcmp(filter->filter->name, "mptestsrc" ) ||
686690 !strcmp(filter->filter->name, "negate" ) ||
687691 !strcmp(filter->filter->name, "overlay" ) ||
688692 !strcmp(filter->filter->name, "pad" ) ||

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t