patch by Tom Harper, d.thomas.harper gmail com

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