History

Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'

* commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe': vsrc_color: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vsrc_color.c

Michael Niedermayer committed 13 years ago

Commit 8bafd832 parents 7f2198a 7bc1a882 files · +25 −16Browse files

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

Unified · Split

libavfilter/avfilter.c+1−0
@@ -675,6 +675,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 674 unmodified lines
675 !strcmp(filter->filter->name, "cellauto") ||675 !strcmp(filter->filter->name, "cellauto") ||
676 !strcmp(filter->filter->name, "channelmap") ||676 !strcmp(filter->filter->name, "channelmap") ||
677 !strcmp(filter->filter->name, "channelsplit") ||677 !strcmp(filter->filter->name, "channelsplit") ||
678 !strcmp(filter->filter->name, "color" ) ||
678 !strcmp(filter->filter->name, "colormatrix") ||679 !strcmp(filter->filter->name, "colormatrix") ||
679 !strcmp(filter->filter->name, "crop" ) ||680 !strcmp(filter->filter->name, "crop" ) ||
680 !strcmp(filter->filter->name, "cropdetect") ||681 !strcmp(filter->filter->name, "cropdetect") ||

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