diff options
| author | Nicolas George <george@nsup.org> | 2016-12-19 08:38:15 +0100 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2017-01-12 14:06:16 +0100 |
| commit | 3ff01feda30a131e877c01619761c2b62e45c9e8 (patch) | |
| tree | 7ff3551705d58adfbc9f71c031269d65d92be477 /libavfilter/avfilter.c | |
| parent | db4a71c0ff4a925d1c2d0b5bde6e2760ec55b2d0 (diff) | |
| download | ffmpeg-streaming-3ff01feda30a131e877c01619761c2b62e45c9e8.zip ffmpeg-streaming-3ff01feda30a131e877c01619761c2b62e45c9e8.tar.gz | |
lavfi: add AVFilter.activate.
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b2a6b58..9ae0cb6 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1480,8 +1480,12 @@ int ff_filter_activate(AVFilterContext *filter) { int ret; + /* Generic timeline support is not yet implemented but should be easy */ + av_assert1(!(filter->filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC && + filter->filter->activate)); filter->ready = 0; - ret = ff_filter_activate_default(filter); + ret = filter->filter->activate ? filter->filter->activate(filter) : + ff_filter_activate_default(filter); if (ret == FFERROR_NOT_READY) ret = 0; return ret; |
