Patch by Ian Braithwaite ian .. braithwaite ... dk

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