[FFmpeg-cvslog] audioconvert: prefer 5.X over 5.X(side).

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sun Nov  6 17:05:08 2011 +0100| [ada8d485c0f77a4e79fac7f3f96031c4d0e6bc7a] | committer: Michael Niedermayer

audioconvert: prefer 5.X over 5.X(side).
This is the logical consequence of commit ab539d9e:
5.X(back) is more common than 5.X(side).

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=ada8d485c0f77a4e79fac7f3f96031c4d0e6bc7a
---

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

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index f4c74f6..0bcc9b7 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 },
     { "5.1+downmix", 8,  AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },