[FFmpeg-cvslog] avfilter/avfilter: move enable_str expression parsing into avfilter_init_dict()

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Feb  5 12:23:57 2021 +0100| [6317d40d0813fa1e251730052de87fafb909b829] | committer: Paul B Mahol

avfilter/avfilter: move enable_str expression parsing into avfilter_init_dict()

This ensures that needed arrays are always allocated and properly initialized.

Previously if code would use only avfilter_init_dict() to set options for filters
it would not allocate arrays for timeline processing thus it would crash if
user supplied enable option for filter(s).

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6317d40d0813fa1e251730052de87fafb909b829
---

 libavfilter/avfilter.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 4c52d83842..d560655f42 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -875,11 +875,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
         count++;
     }
 
-    if (ctx->enable_str) {
-        ret = set_enable_expr(ctx, ctx->enable_str);
-        if (ret < 0)
-            return ret;
-    }
     return count;
 }
 
@@ -930,6 +925,12 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
     else if (ctx->filter->init_dict)
         ret = ctx->filter->init_dict(ctx, options);
 
+    if (ctx->enable_str) {
+        ret = set_enable_expr(ctx, ctx->enable_str);
+        if (ret < 0)
+            return ret;
+    }
+
     return ret;
 }