Patch by Martin Storsjö / martin von martin aus st

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