Patch by Ian Caulfield, ian D caulfield A gmail

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