aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/channel_layout.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-02-09 18:14:46 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-02-09 18:14:46 +0100
commite149127bb217a5a5890fc6f1fd9e0cf69db710bc (patch)
tree0b28f91605ffd2ffb2d14abba8827f9ccfda5ef2 /libavutil/channel_layout.c
parentfaac85005cadb5065d218b0563eeb3272a498073 (diff)
downloadffmpeg-e149127bb217a5a5890fc6f1fd9e0cf69db710bc.tar.gz
Call the common 7.1 wide channel layout "7.1(wide)".
Rename the uncommon variant with side speakers to "7.1(wide-side)".
Diffstat (limited to 'libavutil/channel_layout.c')
-rw-r--r--libavutil/channel_layout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index ef6bad788b..e5827605ea 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -97,7 +97,8 @@ static const struct {
{ "7.0", 7, AV_CH_LAYOUT_7POINT0 },
{ "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT },
{ "7.1", 8, AV_CH_LAYOUT_7POINT1 },
- { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
+ { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE_BACK },
+ { "7.1(wide-side)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
{ "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL },
{ "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, },
};