patch by Alexander Strange, astrange ithinksw com

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