diff options
| author | Marton Balint <cus@passwd.hu> | 2016-09-05 21:51:21 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2016-09-13 21:35:31 +0200 |
| commit | 025db5afaf28228aa14f9621b09bd424a2c1adfb (patch) | |
| tree | 7c62c809511f8a34516e81b3bc5fda0101be99cc /libavfilter/af_amerge.c | |
| parent | d41bfa9c0b109e6ef8310392cf8a5ee6741a5ea5 (diff) | |
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 <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavfilter/af_amerge.c')
| -rw-r--r-- | libavfilter/af_amerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 } }; |