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

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