[FFmpeg-devel] [PATCH 3/5] audioconvert: prefer 5.X over 5.X(side).

Nicolas George nicolas.george at normalesup.org
Sat Nov 5 21:21:49 CET 2011


Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavutil/audioconvert.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 99a5f02..828780c 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -66,10 +66,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(side)",   5,  AV_CH_LAYOUT_5POINT0 },
     { "5.0",         5,  AV_CH_LAYOUT_5POINT0_BACK },
-    { "5.1(side)",   6,  AV_CH_LAYOUT_5POINT1 },
+    { "5.0(side)",   5,  AV_CH_LAYOUT_5POINT0 },
     { "5.1",         6,  AV_CH_LAYOUT_5POINT1_BACK },
+    { "5.1(side)",   6,  AV_CH_LAYOUT_5POINT1 },
     { "7.1",         8,  AV_CH_LAYOUT_7POINT1 },
     { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE },
     { "downmix",     2,  AV_CH_LAYOUT_STEREO_DOWNMIX, },
-- 
1.7.7



More information about the ffmpeg-devel mailing list