diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:53:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:53:08 +0200 |
| commit | 57148122375a8f7aa387bef6b993b936dbb70777 (patch) | |
| tree | 56e9570a593478fedb3887edebd9180f6f9f0111 /libavfilter/avfilter.c | |
| parent | ac217bda30a79177c8a47713b3db12dc9e9bd45b (diff) | |
| parent | f43da3def7645b99d67846fa6d6175b4ece3e9e4 (diff) | |
| download | ffmpeg-streaming-57148122375a8f7aa387bef6b993b936dbb70777.zip ffmpeg-streaming-57148122375a8f7aa387bef6b993b936dbb70777.tar.gz | |
Merge remote-tracking branch 'mbouron/shorthand-cleanup'
* mbouron/shorthand-cleanup:
lavfi/aphaser: switch to AVOption-based system
lavfi/apad: switch to AVOption-based system
lavfi/afade: switch to AVOption-base system
lavfi/blend: switch to AVOption-based system
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index abf8cd6..4696eae 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -656,11 +656,15 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque AVDictionaryEntry *e; int ret=0; int anton_options = + !strcmp(filter->filter->name, "afade" ) || !strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "amix" ) || + !strcmp(filter->filter->name, "apad" ) || + !strcmp(filter->filter->name, "aphaser" ) || !strcmp(filter->filter->name, "ass") || !strcmp(filter->filter->name, "asyncts" ) || !strcmp(filter->filter->name, "blackframe") || + !strcmp(filter->filter->name, "blend" ) || !strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "cellauto") || !strcmp(filter->filter->name, "colormatrix") || |
