[FFmpeg-cvslog] avfilter/af_amerge: allow merging 1 input only

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Mon Sep  5 21:51:21 2016 +0200| [025db5afaf28228aa14f9621b09bd424a2c1adfb] | committer: Marton Balint

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 at nsup.org>
Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=025db5afaf28228aa14f9621b09bd424a2c1adfb
---

 libavfilter/af_amerge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 2b4edb0..4a8c6d5 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 }
 };