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