History

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

* ubitux/shorthand-cleanup: lavfi/subtitles: switch to an AVOptions-based system. lavfi/pp: switch to an AVOptions-based system. lavfi/geq: switch to an AVOptions-based system. lavfi/edgedetect: switch to an AVOptions-based system. lavfi/curves: switch to an AVOptions-based system. lavfi/colormatrix: switch to an AVOptions-based system. lavfi/perms: switch to an AVOptions-based system. lavfi/ebur128: switch to an AVOptions-based system. lavfi/showspectrum: switch to an AVOptions-based system. lavfi/silencedetect: switch to an AVOptions-based system. lavfi/thumbnail: switch to an AVOptions-based system.

Michael Niedermayer committed 13 years ago

Commit 270d3c92 parents b3fb2d8 e2b0edb16 files · +83 −135Browse files

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

Unified · Split

libavfilter/avfilter.c+13−0
@@ -657,18 +657,24 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 656 unmodified lines
657 int ret=0;657 int ret=0;
658 int anton_options =658 int anton_options =
659 !strcmp(filter->filter->name, "aformat") ||659 !strcmp(filter->filter->name, "aformat") ||
660 !strcmp(filter->filter->name, "ass") ||
660 !strcmp(filter->filter->name, "blackframe") ||661 !strcmp(filter->filter->name, "blackframe") ||
661 !strcmp(filter->filter->name, "boxblur" ) ||662 !strcmp(filter->filter->name, "boxblur" ) ||
663 !strcmp(filter->filter->name, "colormatrix") ||
662 !strcmp(filter->filter->name, "crop" ) ||664 !strcmp(filter->filter->name, "crop" ) ||
663 !strcmp(filter->filter->name, "cropdetect") ||665 !strcmp(filter->filter->name, "cropdetect") ||
666 !strcmp(filter->filter->name, "curves" ) ||
664 !strcmp(filter->filter->name, "delogo" ) ||667 !strcmp(filter->filter->name, "delogo" ) ||
665 !strcmp(filter->filter->name, "drawbox" ) ||668 !strcmp(filter->filter->name, "drawbox" ) ||
666 !strcmp(filter->filter->name, "drawtext" ) ||669 !strcmp(filter->filter->name, "drawtext" ) ||
670 !strcmp(filter->filter->name, "ebur128" ) ||
671 !strcmp(filter->filter->name, "edgedetect") ||
667 !strcmp(filter->filter->name, "fade" ) ||672 !strcmp(filter->filter->name, "fade" ) ||
668 !strcmp(filter->filter->name, "fieldorder") ||673 !strcmp(filter->filter->name, "fieldorder") ||
669 !strcmp(filter->filter->name, "fps" ) ||674 !strcmp(filter->filter->name, "fps" ) ||
670 !strcmp(filter->filter->name, "frei0r" ) ||675 !strcmp(filter->filter->name, "frei0r" ) ||
671 !strcmp(filter->filter->name, "frei0r_src") ||676 !strcmp(filter->filter->name, "frei0r_src") ||
677 !strcmp(filter->filter->name, "geq" ) ||
672 !strcmp(filter->filter->name, "gradfun" ) ||678 !strcmp(filter->filter->name, "gradfun" ) ||
673 !strcmp(filter->filter->name, "hqdn3d" ) ||679 !strcmp(filter->filter->name, "hqdn3d" ) ||
674 !strcmp(filter->filter->name, "ocv" ) ||680 !strcmp(filter->filter->name, "ocv" ) ||
@@ -680,7 +686,14 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 5 unmodified lines
680 !strcmp(filter->filter->name, "pad" ) ||686 !strcmp(filter->filter->name, "pad" ) ||
681 !strcmp(filter->filter->name, "format") ||687 !strcmp(filter->filter->name, "format") ||
682 !strcmp(filter->filter->name, "noformat") ||688 !strcmp(filter->filter->name, "noformat") ||
689 !strcmp(filter->filter->name, "perms") ||
690 !strcmp(filter->filter->name, "pp" ) ||
691 !strcmp(filter->filter->name, "aperms") ||
683 !strcmp(filter->filter->name, "resample") ||692 !strcmp(filter->filter->name, "resample") ||
693 !strcmp(filter->filter->name, "showspectrum") ||
694 !strcmp(filter->filter->name, "silencedetect") ||
695 !strcmp(filter->filter->name, "subtitles") ||
696 !strcmp(filter->filter->name, "thumbnail") ||
684// !strcmp(filter->filter->name, "scale" ) ||697// !strcmp(filter->filter->name, "scale" ) ||
685 !strcmp(filter->filter->name, "select") ||698 !strcmp(filter->filter->name, "select") ||
686 0699 0

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