Originally committed as revision 21573 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 21570 to svn://svn.ffmpeg.org/ffmpeg/trunk