This is 3 times faster in a quick benchmark

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