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