Set a better error msg than the current failure to configure output pad.
From 119516fe777e1e026503a6ba176a662680d711bd Mon Sep 17 00:00:00 2001
From: Gyan Doshi <ffm...@gyani.pro>
Date: Tue, 7 May 2019 16:00:40 +0530
Subject: [PATCH] avfilter/xstack: set better error msg for missing layout
---
libavfilter/vf_stack.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c
index b836d96bf0..1455f196a7 100644
--- a/libavfilter/vf_stack.c
+++ b/libavfilter/vf_stack.c
@@ -83,6 +83,15 @@ static av_cold int init(AVFilterContext *ctx)
return AVERROR(ENOMEM);
if (!strcmp(ctx->filter->name, "xstack")) {
+ if (!s->layout) {
+ if (s->nb_inputs == 2)
+ s->layout = "0_0|w0_0";
+ else {
+ av_log(ctx, AV_LOG_ERROR, "No layout specified.\n");
+ return AVERROR(EINVAL);
+ }
+ }
+
s->items = av_calloc(s->nb_inputs, sizeof(*s->items));
if (!s->items)
return AVERROR(ENOMEM);
@@ -385,7 +394,7 @@ AVFilter ff_vf_vstack = {
static const AVOption xstack_options[] = {
{ "inputs", "set number of inputs", OFFSET(nb_inputs), AV_OPT_TYPE_INT,
{.i64=2}, 2, INT_MAX, .flags = FLAGS },
- { "layout", "set custom layout", OFFSET(layout), AV_OPT_TYPE_STRING,
{.str="0_0|w0_0"}, 0, 0, .flags = FLAGS },
+ { "layout", "set custom layout", OFFSET(layout), AV_OPT_TYPE_STRING,
{.str=NULL}, 0, 0, .flags = FLAGS },
{ "shortest", "force termination when the shortest input terminates",
OFFSET(shortest), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, .flags = FLAGS },
{ NULL },
};
--
2.21.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".