patch by John Dalgliesh, johnd **at** defyne **dot** org

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