[FFmpeg-devel] [PATCH 10/17] lavfi: add AVFilter.activate.

Nicolas George george at nsup.org
Sat Dec 24 19:41:42 EET 2016


Signed-off-by: Nicolas George <george at nsup.org>
---
 libavfilter/avfilter.c | 6 +++++-
 libavfilter/avfilter.h | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 1df1157f02..4638ff71ee 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1479,8 +1479,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;
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 6109e5865c..d957a14482 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -294,6 +294,11 @@ typedef struct AVFilter {
      * used for providing binary data.
      */
     int (*init_opaque)(AVFilterContext *ctx, void *opaque);
+
+    /**
+     * Filter activation function.
+     */
+    int (*activate)(AVFilterContext *ctx);
 } AVFilter;
 
 /**
-- 
2.11.0



More information about the ffmpeg-devel mailing list