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