Originally committed as revision 21574 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 21569 to svn://svn.ffmpeg.org/ffmpeg/trunk