Patch by Marcus Engene <hisfirstname(at)hislastname.se>

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