[FFmpeg-cvslog] Call the common 7.1 wide channel layout "7.1(wide)".

Carl Eugen Hoyos git at videolan.org
Sat Feb 9 18:16:32 CET 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Feb  9 18:14:46 2013 +0100| [e149127bb217a5a5890fc6f1fd9e0cf69db710bc] | committer: Carl Eugen Hoyos

Call the common 7.1 wide channel layout "7.1(wide)".

Rename the uncommon variant with side speakers to "7.1(wide-side)".

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

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

diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index ef6bad7..e582760 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, },
 };



More information about the ffmpeg-cvslog mailing list