patch by mark cox, melbournemark+ffmpeg gmail.com

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