[FFmpeg-cvslog] lavfi/amerge: make description consistent with documentation

Paul B Mahol git at videolan.org
Mon Feb 11 15:46:06 CET 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Feb 11 12:47:02 2013 +0000| [8160864b00271214ab7b144e70e512ba8a76ffdc] | committer: Paul B Mahol

lavfi/amerge: make description consistent with documentation

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 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 f67a7a8..357cbbe 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -341,7 +341,7 @@ static const AVFilterPad amerge_outputs[] = {
 
 AVFilter avfilter_af_amerge = {
     .name          = "amerge",
-    .description   = NULL_IF_CONFIG_SMALL("Merge two audio streams into "
+    .description   = NULL_IF_CONFIG_SMALL("Merge two or more audio streams into "
                                           "a single multi-channel stream."),
     .priv_size     = sizeof(AMergeContext),
     .init          = init,



More information about the ffmpeg-cvslog mailing list