diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:23:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 02:31:14 +0200 |
| commit | 5e5ef6e8aecd299e4550e6c59ae5ce8db27358de (patch) | |
| tree | 4d1fd8ab7f142ddf5f579f3576a13f1e9a560e2a /libavfilter/avfilter.c | |
| parent | f17651bd160d28d3a34c08c7aa537ef86defcc94 (diff) | |
| parent | 7c79ec66b6cc25a150d33d7397c8f4310b77e70f (diff) | |
Merge remote-tracking branch 'richardpl/framestep'
* richardpl/framestep:
lavfi/framestep: remove request_frame hack
lavfi/framestep: switch to an AVOptions-based system
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 faef796c10..2b8b8cda76 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -683,6 +683,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque !strcmp(filter->filter->name, "field" ) || !strcmp(filter->filter->name, "fieldorder") || !strcmp(filter->filter->name, "fps" ) || + !strcmp(filter->filter->name, "framestep" ) || !strcmp(filter->filter->name, "frei0r" ) || !strcmp(filter->filter->name, "frei0r_src") || !strcmp(filter->filter->name, "geq" ) || |