diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:03:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:10:12 +0200 |
| commit | d9d7c54960804262bff36939c8392087aa92a8d0 (patch) | |
| tree | fc20374a6cba10003160c490bf00c4442081c1ef /libavfilter/avfilter.c | |
| parent | 57148122375a8f7aa387bef6b993b936dbb70777 (diff) | |
| parent | ba8efac977f4276f05274947b2b67d144cbc965a (diff) | |
Merge commit 'ba8efac977f4276f05274947b2b67d144cbc965a'
* commit 'ba8efac977f4276f05274947b2b67d144cbc965a':
af_channelmap: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_channelmap.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 4696eaeb5e..632ab4953d 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -667,6 +667,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "blend" ) || !strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "cellauto") || + !strcmp(filter->filter->name, "channelmap") || !strcmp(filter->filter->name, "colormatrix") || !strcmp(filter->filter->name, "crop" ) || !strcmp(filter->filter->name, "cropdetect") || |