Patch by Martin Storsjö <martin at martin st>

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