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