Patch by Martin Storsjö: martin (remove that) at martin (oh and this too) st

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