It will be redone with some cosmetics split out in a moment.

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