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

         !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") ||
         !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"        ) ||

Merge remote-tracking branch 'ubitux/shorthand-cleanup'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code