[FFmpeg-cvslog] audioconvert: use + in av_get_channel_layout_string.

Nicolas George git at videolan.org
Sun Nov 6 02:05:28 CET 2011


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Nov  5 21:21:50 2011 +0100| [1125571b736b664a5ef079ec9e6f09640682eeda] | committer: Michael Niedermayer

audioconvert: use + in av_get_channel_layout_string.

When constructing a channel layout string from individual channel names,
+ is a more practical separator than |, because it is usually not a shell
special character.

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavutil/audioconvert.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index d89796d..f4c74f6 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -113,7 +113,7 @@ void av_get_channel_layout_string(char *buf, int buf_size,
                 const char *name = get_channel_name(i);
                 if (name) {
                     if (ch > 0)
-                        av_strlcat(buf, "|", buf_size);
+                        av_strlcat(buf, "+", buf_size);
                     av_strlcat(buf, name, buf_size);
                 }
                 ch++;



More information about the ffmpeg-cvslog mailing list