Patch by Eli Friedman eli D friedman A gmail

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