Remove the 3-front-channel layout from the list of channel layout

aliases.  Calling this "surround" is confusing and questionable.

Originally committed as revision 19183 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index 5842801..4555128 100644 (file)
--- a/libavcodec/audioconvert.c
+++ b/libavcodec/audioconvert.c
@@ -107,7 +107,6 @@ static const struct {
 } channel_layout_map[] = {
     { "mono",        1,  CH_LAYOUT_MONO },
     { "stereo",      2,  CH_LAYOUT_STEREO },
-    { "surround",    3,  CH_LAYOUT_SURROUND },
     { "4.0",         4,  CH_LAYOUT_4POINT0 },
     { "quad",        4,  CH_LAYOUT_QUAD },
     { "5.0",         5,  CH_LAYOUT_5POINT0 },