History

Merge commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd'

* commit 'ffea3b00c39caa8ad78456ae08c8353929974dfd': vf_settb: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/f_settb.c

Michael Niedermayer committed 13 years ago

Commit 6a2fb5b2 parents 8695d9d ffea3b03 files · +13 −8Browse files

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

Unified · Split

libavfilter/avfilter.c+1−0
@@ -691,6 +691,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 690 unmodified lines
691 !strcmp(filter->filter->name, "aperms") ||691 !strcmp(filter->filter->name, "aperms") ||
692 !strcmp(filter->filter->name, "resample") ||692 !strcmp(filter->filter->name, "resample") ||
693 !strcmp(filter->filter->name, "setpts" ) ||693 !strcmp(filter->filter->name, "setpts" ) ||
694 !strcmp(filter->filter->name, "settb" ) ||
694 !strcmp(filter->filter->name, "showspectrum") ||695 !strcmp(filter->filter->name, "showspectrum") ||
695 !strcmp(filter->filter->name, "silencedetect") ||696 !strcmp(filter->filter->name, "silencedetect") ||
696 !strcmp(filter->filter->name, "smartblur") ||697 !strcmp(filter->filter->name, "smartblur") ||

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