Patch by James Darnley, james dot darnley at gmail

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