Patch by Reimar Döffinger and Eli Friedman (independently).

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