From a4b12c54b64f31e005adb8b07d7c45876e91f0f5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 16 Feb 2020 16:21:03 +0100 Subject: f_lavfi: don't propagate filter failure if creation fails Filters that fail to create are not supposed to do this. Generally it should happen in process() only. This fixes the previous commit. If a filter could not be created, it "trashed" the wrapper filter with the failure. (Even if the wrapper were to handle were to handle failures of sub-filter, it couldn't handle init failure because it cannot call mp_filter_set_error_handler() before the newly created filter is actually returned.) Fixes: #7465 (attempt 2) --- filters/f_lavfi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/filters/f_lavfi.c b/filters/f_lavfi.c index 18bad4b5f4..71624a449b 100644 --- a/filters/f_lavfi.c +++ b/filters/f_lavfi.c @@ -304,7 +304,6 @@ static void precreate_graph(struct lavfi *c, bool first_init) error: free_graph(c); c->failed = true; - mp_filter_internal_mark_failed(c->f); return; } @@ -518,7 +517,6 @@ static bool init_pads(struct lavfi *c) error: MP_FATAL(c, "could not initialize filter pads\n"); c->failed = true; - mp_filter_internal_mark_failed(c->f); return false; } @@ -556,7 +554,6 @@ static void init_graph(struct lavfi *c) MP_FATAL(c, "failed to configure the filter graph\n"); free_graph(c); c->failed = true; - mp_filter_internal_mark_failed(c->f); return; } -- cgit v1.2.3