summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-02-10 21:49:44 +0100
committerwm4 <wm4@nowhere>2016-02-10 22:01:16 +0100
commited6c04b1e5d614d997a2862c5d81ced04389b0f6 (patch)
tree15ea946d28c77d6b41d38a2182b96ce237eea043
parent8af71128028d76d070c238b905593c93d4a4336d (diff)
downloadmpv-ed6c04b1e5d614d997a2862c5d81ced04389b0f6.tar.bz2
mpv-ed6c04b1e5d614d997a2862c5d81ced04389b0f6.tar.xz
lavfi: stop playback on some unrecoverable situations
Also improve the error message for the missing label case.
-rw-r--r--player/lavfi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/player/lavfi.c b/player/lavfi.c
index 76b47450ea..57f70fa443 100644
--- a/player/lavfi.c
+++ b/player/lavfi.c
@@ -121,7 +121,8 @@ static void add_pad(struct lavfi *c, enum lavfi_direction dir, AVFilterInOut *it
}
if (!item->name) {
- MP_FATAL(c, "what the shit\n");
+ MP_FATAL(c, "filter pad without name label\n");
+ c->failed = true;
return;
}
@@ -130,6 +131,7 @@ static void add_pad(struct lavfi *c, enum lavfi_direction dir, AVFilterInOut *it
// Graph recreation case: reassociate an existing pad.
if (p->dir != dir || p->type != type) {
MP_FATAL(c, "pad '%s' changed type or direction\n", item->name);
+ c->failed = true;
return;
}
} else {