From 3ff01feda30a131e877c01619761c2b62e45c9e8 Mon Sep 17 00:00:00 2001 From: Nicolas George Date: Mon, 19 Dec 2016 08:38:15 +0100 Subject: lavfi: add AVFilter.activate. --- libavfilter/avfilter.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavfilter/avfilter.c') 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; -- cgit v1.1