summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-16 16:21:03 +0100
committerwm4 <wm4@nowhere>2020-02-16 16:21:03 +0100
commita4b12c54b64f31e005adb8b07d7c45876e91f0f5 (patch)
treebef6be47bf2865e9e933e57acaa366e6ec2eafd6
parenta19d918816866180a4ddc8be371dfb8b9394fc28 (diff)
downloadmpv-a4b12c54b64f31e005adb8b07d7c45876e91f0f5.tar.bz2
mpv-a4b12c54b64f31e005adb8b07d7c45876e91f0f5.tar.xz
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)
-rw-r--r--filters/f_lavfi.c3
1 files changed, 0 insertions, 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;
}