Patch by James Darnley <james dot darnley at gmail dot com>.

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