aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Cracauer <cracauer@cons.org>2015-12-01 17:59:36 -0500
committerMichael Niedermayer <michael@niedermayer.cc>2016-05-01 05:00:44 +0200
commit3433e52d48ace11f5cbfd438ee127f7ae6eccb1b (patch)
treeaa7cf688828f4d9485dc81ecb4083d36b67cdcc3
parent59648ab954caa582595db9020c7c1d94b84bf31f (diff)
downloadffmpeg-3433e52d48ace11f5cbfd438ee127f7ae6eccb1b.tar.gz
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@niedermayer.cc> (cherry picked from commit 73d1398f0c4ce2de16790f46e05a79242137d153) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavutil/channel_layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index 45249c4367..7aceb81971 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 },