History

Merge commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e'

* commit '95f1f56a21bc2f824af6fb97ca7ab35cdd0c401e': vf_select: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/f_select.c

Michael Niedermayer committed 13 years ago

Commit b3fb2d82 parents 7e99ccf 95f1f563 files · +30 −21Browse files

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

Unified · Split

libavfilter/avfilter.c+1−0
@@ -682,6 +682,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 681 unmodified lines
682 !strcmp(filter->filter->name, "noformat") ||682 !strcmp(filter->filter->name, "noformat") ||
683 !strcmp(filter->filter->name, "resample") ||683 !strcmp(filter->filter->name, "resample") ||
684// !strcmp(filter->filter->name, "scale" ) ||684// !strcmp(filter->filter->name, "scale" ) ||
685 !strcmp(filter->filter->name, "select") ||
685 0686 0
686 ;687 ;
687 688

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