[FFmpeg-cvslog] Use the shorter channel layout description for the common case.

Carl Eugen Hoyos git at videolan.org
Sun Aug 28 23:18:19 CEST 2011


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun Aug 28 22:37:11 2011 +0200| [ab539d9eb88dd20e6d5409464d74a899a507a3dd] | committer: Carl Eugen Hoyos

Use the shorter channel layout description for the common case.

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

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

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 6e8649d..61dd6f3 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -51,10 +51,10 @@ static const struct {
     { "stereo",      2,  AV_CH_LAYOUT_STEREO },
     { "4.0",         4,  AV_CH_LAYOUT_4POINT0 },
     { "quad",        4,  AV_CH_LAYOUT_QUAD },
-    { "5.0",         5,  AV_CH_LAYOUT_5POINT0 },
-    { "5.0(back)",   5,  AV_CH_LAYOUT_5POINT0_BACK },
-    { "5.1",         6,  AV_CH_LAYOUT_5POINT1 },
-    { "5.1(back)",   6,  AV_CH_LAYOUT_5POINT1_BACK },
+    { "5.0(side)",   5,  AV_CH_LAYOUT_5POINT0 },
+    { "5.0",         5,  AV_CH_LAYOUT_5POINT0_BACK },
+    { "5.1(side)",   6,  AV_CH_LAYOUT_5POINT1 },
+    { "5.1",         6,  AV_CH_LAYOUT_5POINT1_BACK },
     { "5.1+downmix", 8,  AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
     { "7.1",         8,  AV_CH_LAYOUT_7POINT1 },
     { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE },



More information about the ffmpeg-cvslog mailing list