aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-08-28 22:37:11 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-08-28 22:37:11 +0200
commitab539d9eb88dd20e6d5409464d74a899a507a3dd (patch)
treec89b04941771699b31082ff00a967612b88e55c3
parent262ab1c59adc20f07dd7520dee6aae78d1a706e4 (diff)
downloadffmpeg-ab539d9eb88dd20e6d5409464d74a899a507a3dd.tar.gz
Use the shorter channel layout description for the common case.
-rw-r--r--libavutil/audioconvert.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 6e8649d56c..61dd6f3ccc 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 },