patch by Alexander Strange %astrange A ithinksw P com%

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