diff options
| author | Gyan Doshi <ffmpeg@gyani.pro> | 2019-05-07 16:00:40 +0530 |
|---|---|---|
| committer | Gyan Doshi <ffmpeg@gyani.pro> | 2019-05-07 16:45:11 +0530 |
| commit | b3b7ba623f95224557bd67a060adf4ca7ee94dde (patch) | |
| tree | 0cebe50db4a75c6edc3373f5babe8417b85b16fa /libavfilter/vf_stack.c | |
| parent | e25bddf5fce88f95be8bf3cbc8adf4a74bc28fb5 (diff) | |
avfilter/vf_xstack: set better error msg for
missing layout
Diffstat (limited to 'libavfilter/vf_stack.c')
| -rw-r--r-- | libavfilter/vf_stack.c | 11 |
1 files changed, 10 insertions, 1 deletions
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 }, }; |