From c256491f9669893917f4db5c0cf56b17530f10b6 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 15 Sep 2021 05:13:11 +0200 Subject: [PATCH] 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 Signed-off-by: Andreas Rheinhardt (cherry picked from commit 10ad3cd7982e5a5d922cabd176c97571a7684c60) --- 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)