To avoid being burned at the stake by an angry mob, I am forced to
revert this commit.

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