aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2011-10-06 23:19:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-07 00:57:05 +0200
commit9bf4371e1bbd981a2a6bf2aaf754ec0684f2ae7d (patch)
tree2fc94e868dcdff1a7b2dd115efa77224757fefe7
parente588a5c2d418fdcf08ece076a2642de44f444d55 (diff)
downloadffmpeg-9bf4371e1bbd981a2a6bf2aaf754ec0684f2ae7d.tar.gz
audioconvert: make 7POINT1 channel layout the default for 8 channels
Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/audioconvert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 4a8794276e..be7a0f7c3a 100644
--- a/libavutil/audioconvert.c
+++ b/libavutil/audioconvert.c
@@ -70,9 +70,9 @@ static const struct {
{ "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 },
+ { "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
{ "7.1+downmix", 10, AV_CH_LAYOUT_7POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
{ 0 }
};