patch by Paul Kelly  paul stjohnspoint co uk
with some changes by me

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