does not change any current channel mapping behavior.

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