[FFmpeg-cvslog] avfilter/avfilter: Actually error out on init error

[Andreas Rheinhardt]

ffmpeg | branch: release/4.4 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Sep 15 05:13:11 2021 +0200| [c256491f9669893917f4db5c0cf56b17530f10b6] | committer: Andreas Rheinhardt

avfilter/avfilter: Actually error out on init error

Currently an error from init could be overwritten by successfully
setting the enable expression.

Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit 10ad3cd7982e5a5d922cabd176c97571a7684c60)

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

 libavfilter/avfilter.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 22ecad5f77..6a344282eb 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -925,6 +925,8 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
         ret = ctx->filter->init(ctx);
     else if (ctx->filter->init_dict)
         ret = ctx->filter->init_dict(ctx, options);
+    if (ret < 0)
+        return ret;
 
     if (ctx->enable_str) {
         ret = set_enable_expr(ctx, ctx->enable_str);
@@ -932,7 +934,7 @@ int avfilter_init_dict(AVFilterContext *ctx, AVDictionary **options)
             return ret;
     }
 
-    return ret;
+    return 0;
 }
 
 int avfilter_init_str(AVFilterContext *filter, const char *args)