Patch by Martin Storsjö, martin at martin dot st

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