Patch by Alexander Strange (astrange ithinksw com)

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