Originally committed as revision 21897 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 21695 to svn://svn.ffmpeg.org/ffmpeg/trunk