[FFmpeg-cvslog] lavfi/amerge: clarify the error message in case of input overlap

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Tue Sep 11 10:32:13 2012 +0200| [30151944488f7b008187365c11ac043e0ba3db7d] | committer: Stefano Sabatini

lavfi/amerge: clarify the error message in case of input overlap

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

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

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index db3539d..77ea297 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -102,7 +102,8 @@ static int query_formats(AVFilterContext *ctx)
     }
     if (overlap) {
         av_log(ctx, AV_LOG_WARNING,
-               "Inputs overlap: output layout will be meaningless\n");
+               "Input channel layouts overlap: "
+               "output layout will be determined by the number of distinct input channels\n");
         for (i = 0; i < nb_ch; i++)
             am->route[i] = i;
         outlayout = av_get_default_channel_layout(nb_ch);