This also reduces the needed headroom in that step by 1 bit

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