(will be cleaned up in next commits) Originally committed as revision 14802 to svn://svn.ffmpeg.org/ffmpeg/trunk