Patch by Alexander Strange \astrange ithinksw com/

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