Originally committed as revision 12652 to svn://svn.ffmpeg.org/ffmpeg/trunk
Patch by Eli Friedman (eli friedman gmail com) Originally committed as revision 12648 to svn://svn.ffmpeg.org/ffmpeg/trunk