Patch by Ian Braithwaite <ian at braithwaite dot dk>

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