From 025db5afaf28228aa14f9621b09bd424a2c1adfb Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Mon, 5 Sep 2016 21:51:21 +0200 Subject: avfilter/af_amerge: allow merging 1 input only Useful when the amerge filter parameters are generated from a script based on the number of input streams, by allowing 1 input it does not have to be handled specially. The split filter also allows 1 output, so it is more consistent to allow merging 1 input as well. Reviewed-by: Nicolas George Signed-off-by: Marton Balint --- libavfilter/af_amerge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavfilter/af_amerge.c') diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 2b4edb09ff..4a8c6d5bd0 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -52,7 +52,7 @@ typedef struct { static const AVOption amerge_options[] = { { "inputs", "specify the number of inputs", OFFSET(nb_inputs), - AV_OPT_TYPE_INT, { .i64 = 2 }, 2, SWR_CH_MAX, FLAGS }, + AV_OPT_TYPE_INT, { .i64 = 2 }, 1, SWR_CH_MAX, FLAGS }, { NULL } }; -- cgit v1.2.3