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

[Nicolas George]

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>
---
 libavutil/audioconvert.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Stefano:
> Why? => possibly explain it in the log.

Is it better? For reference:

# commit ab539d9eb88dd20e6d5409464d74a899a507a3dd
# Author: Carl Eugen Hoyos <cehoyos at ag.or.at>
# Date:   Sun Aug 28 22:37:11 2011 +0200
# 
#     Use the shorter channel layout description for the common case.
# 
# 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 },


diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 1bf2d4c..9d236f3 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.1