diff options
| author | Michael Niedermayer <[email protected]> | 2013-04-11 01:39:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-04-11 01:42:28 +0200 |
| commit | ac217bda30a79177c8a47713b3db12dc9e9bd45b (patch) | |
| tree | 79dedb63dc984965e81a5718a5a376313d75c7f4 /libavfilter/avfilter.c | |
| parent | 314be1933e3a39abd6576184786703701ced4415 (diff) | |
| parent | b2b25b0659fa047da6266d2ce165d43011136b30 (diff) | |
Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
* commit 'b2b25b0659fa047da6266d2ce165d43011136b30':
af_asyncts: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <[email protected]>
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 497a867801..abf8cd6e41 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "aformat") || !strcmp(filter->filter->name, "amix" ) || !strcmp(filter->filter->name, "ass") || + !strcmp(filter->filter->name, "asyncts" ) || !strcmp(filter->filter->name, "blackframe") || !strcmp(filter->filter->name, "boxblur" ) || !strcmp(filter->filter->name, "cellauto") || |