[FFmpeg-cvslog] avutil/channel_layout: AV_CH_LAYOUT_6POINT1_BACK not reachable in parsing

Martin Cracauer git at videolan.org
Thu Apr 28 05:29:18 CEST 2016


ffmpeg | branch: release/2.7 | Martin Cracauer <cracauer at cons.org> | Tue Dec  1 17:59:36 2015 -0500| [2a73404558d4f8ac116e7dfe149403e82bc4f6d5] | committer: Michael Niedermayer

avutil/channel_layout: AV_CH_LAYOUT_6POINT1_BACK not reachable in parsing

Trying to make heads and tails out of DTS 6.1 I can across this typo.

I also noticed that this wiki page is incorrect or misleading, the
channel order for 6.1 given does not match the source code.  At the
least it should be clarified that the layout given does not apply to
DTS.  https://trac.ffmpeg.org/wiki/AudioChannelManipulation

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 73d1398f0c4ce2de16790f46e05a79242137d153)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavutil/channel_layout.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 45249c4..7aceb81 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -94,7 +94,7 @@ static const struct {
     { "6.0(front)",  6,  AV_CH_LAYOUT_6POINT0_FRONT },
     { "hexagonal",   6,  AV_CH_LAYOUT_HEXAGONAL },
     { "6.1",         7,  AV_CH_LAYOUT_6POINT1 },
-    { "6.1",         7,  AV_CH_LAYOUT_6POINT1_BACK },
+    { "6.1(back)",   7,  AV_CH_LAYOUT_6POINT1_BACK },
     { "6.1(front)",  7,  AV_CH_LAYOUT_6POINT1_FRONT },
     { "7.0",         7,  AV_CH_LAYOUT_7POINT0 },
     { "7.0(front)",  7,  AV_CH_LAYOUT_7POINT0_FRONT },



More information about the ffmpeg-cvslog mailing list