[FFmpeg-cvslog] audioconvert: make 7POINT1 channel layout the default for 8 channels

Marton Balint git at videolan.org
Fri Oct 7 01:21:53 CEST 2011


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Thu Oct  6 23:19:22 2011 +0200| [9bf4371e1bbd981a2a6bf2aaf754ec0684f2ae7d] | committer: Michael Niedermayer

audioconvert: make 7POINT1 channel layout the default for 8 channels

Signed-off-by: Marton Balint <cus at passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bf4371e1bbd981a2a6bf2aaf754ec0684f2ae7d
---

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

diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c
index 4a87942..be7a0f7 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 }
 };



More information about the ffmpeg-cvslog mailing list