Revert r24339 (it causes fate failures on x86-64) - I'll figure out what's

wrong with it tomorrow or so, then re-submit.

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