Patch by Eli Friedman, eli dot friedman at gmail

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